* Updating git repos no longer uses git-pull -t by default. Git makes it

[code/myrepos.git] / mr

diff --git a/mr b/mr
index ba29b40736def747049d46fd85304150520105d4..079af5273eb5c48fd56247c69f1f03e0aa905be3 100755 (executable)
--- a/mr
+++ b/mr
@@ -30,7 +30,7 @@ B<mr> [options] action [params ...]
 
 B<mr> is a Multiple Repository management tool. It can checkout, update, or
 perform other actions on a set of repositories as if they were one combined
 
 B<mr> is a Multiple Repository management tool. It can checkout, update, or
 perform other actions on a set of repositories as if they were one combined

-respository. It supports any combination of subversion, git, cvs, mecurial,
+repository. It supports any combination of subversion, git, cvs, mecurial,

 bzr and darcs repositories, and support for other revision control systems can
 easily be added.
 
 bzr and darcs repositories, and support for other revision control systems can
 easily be added.
 


@@ -121,8 +121,8 @@ Displays this help.
 
 =back
 
 
 =back
 

-Actions can be abbreviated to any unambiguous subsctring, so
-"mr st" is equivilant to "mr status", and "mr up" is equivilant to "mr
+Actions can be abbreviated to any unambiguous substring, so
+"mr st" is equivalent to "mr status", and "mr up" is equivalent to "mr

 update"
 
 Additional parameters can be passed to most commands, and are passed on
 update"
 
 Additional parameters can be passed to most commands, and are passed on


@@ -1166,7 +1166,12 @@ git_bare_test =
        test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
 
 svn_update = svn update "$@"
        test "`GIT_CONFIG="$MR_REPO"/config git config --get core.bare`" = true
 
 svn_update = svn update "$@"

-git_update = if [ "$@" ]; then git pull "$@"; else git pull -t origin master; fi
+git_update =
+       if [ "$@" ]; then
+               git pull "$@"
+       else
+               git pull
+       fi

 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"
 bzr_update = bzr merge "$@"
 cvs_update = cvs update "$@"
 hg_update  = hg pull "$@" && hg update "$@"


@@ -1250,7 +1255,10 @@ help =
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
        fi
        if [ ! -e "$MR_PATH" ]; then
                error "cannot find program path"
        fi

-       (pod2man -c mr "$MR_PATH" | man -l -) || error "pod2man or man failed"
+       tmp=$(mktemp -t mr.XXXXXXXXXX) || error "mktemp failed"
+       trap "rm -f $tmp" exit
+       pod2man -c mr "$MR_PATH" > "$tmp" || error "pod2man failed"
+       man -l "$tmp" || error "man failed"

 list = true
 config = 
 
 list = true
 config =