Code

git-pull: run repo-config with dash form.
authorJunio C Hamano <junkio@cox.net>
Sat, 18 Mar 2006 10:07:59 +0000 (02:07 -0800)
committerJunio C Hamano <junkio@cox.net>
Sat, 18 Mar 2006 10:07:59 +0000 (02:07 -0800)
... as discussed on the list for consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull.sh

index 17fda26721b7203faffd68bd178d5b757252d4d8..29c14e148e1ff5b6f7bc0d8aca705961f0957eb8 100755 (executable)
@@ -70,14 +70,14 @@ case "$merge_head" in
        exit 0
        ;;
 ?*' '?*)
-       var=`git repo-config --get pull.octopus`
+       var=`git-repo-config --get pull.octopus`
        if test -n "$var"
        then
                strategy_default_args="-s $var"
        fi
        ;;
 *)
-       var=`git repo-config --get pull.twohead`
+       var=`git-repo-config --get pull.twohead`
        if test -n "$var"
         then
                strategy_default_args="-s $var"