X-Git-Url: https://git.madduck.net/code/myrepos.git/blobdiff_plain/042c71119f9a63b74cacc217923fc6e23be31063..1418c08977517227426bbee6ab584e71674fabeb:/mr diff --git a/mr b/mr index a5a9131..cd0dea7 100755 --- a/mr +++ b/mr @@ -22,7 +22,7 @@ B [options] log B [options] register [repository] -B [options] config section [parameter=[value] ...] +B [options] config section ["parameter=[value]" ...] B [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