git push example

[code/myrepos.git] / mr

diff --git a/mr b/mr
index a5a9131c548d30255314bb04910c035323adb129..cd0dea7351f5eb8e941fbd530438d7e4ae0a256f 100755 (executable)
--- a/mr
+++ b/mr
@@ -22,7 +22,7 @@ B<mr> [options] log
 
 B<mr> [options] register [repository]
 
-B<mr> [options] config section [parameter=[value] ...]
+B<mr> [options] config section ["parameter=[value]" ...]
 
 B<mr> [options] action [params ...]
 
@@ -108,6 +108,10 @@ To show the command that mr uses to update the repository in src/foo:
 
   mr config src/foo update
 
+To see the built-in library of shell functions contained in mr:
+
+  mr config DEFAULT lib
+
 The ~/.mrconfig file is used by default. To use a different config file,
 use the -c option.
 
@@ -350,6 +354,7 @@ elsif ($action eq 'config') {
                                    exists $config{$topdir}{$section}{$_}) {
                                        print $config{$topdir}{$section}{$_}."\n";
                                        $found=1;
+                                       last if $section eq 'DEFAULT';
                                }
                        }
                        if (! $found) {
@@ -804,7 +809,11 @@ update =
        if [ -d "$MR_REPO"/.svn ]; then
                svn update "$@"
        elif [ -d "$MR_REPO"/.git ]; then
-               git pull origin master "$@"
+               if [ -z "$@" ]; then
+                       git pull -t origin master
+               else
+                       git pull "$@"
+               fi
        elif [ -d "$MR_REPO"/.bzr ]; then
                bzr merge "$@"
        elif [ -d "$MR_REPO"/CVS ]; then