* Change mr update to use git pull -t origin master, to make sure new tags

[code/myrepos.git] / mr

diff --git a/mr b/mr
index 4630f06898eb23fcdbd49dde3cc78ffeaf70863e..cd0dea7351f5eb8e941fbd530438d7e4ae0a256f 100755 (executable)
--- a/mr
+++ b/mr
@@ -108,6 +108,10 @@ To show the command that mr uses to update the repository in src/foo:
 
   mr config src/foo update
 
 
   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.
 
 The ~/.mrconfig file is used by default. To use a different config file,
 use the -c option.
 


@@ -805,7 +809,11 @@ update =
        if [ -d "$MR_REPO"/.svn ]; then
                svn update "$@"
        elif [ -d "$MR_REPO"/.git ]; then
        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
        elif [ -d "$MR_REPO"/.bzr ]; then
                bzr merge "$@"
        elif [ -d "$MR_REPO"/CVS ]; then