summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-03-18 02:07:59 -0800
committerJunio C Hamano <junkio@cox.net>2006-03-18 02:07:59 -0800
commitf5ef535ff571d80d230ea4706edad215f1fbc96f (patch)
treef884c72d2853a179df94e3e738ebe27e12d65ab2 /git-pull.sh
parent8a414ad50cd9edfe6c8f0a6b9b08df4aaa9ccb75 (diff)
downloadgit-f5ef535ff571d80d230ea4706edad215f1fbc96f.tar.gz
git-pull: run repo-config with dash form.
... as discussed on the list for consistency. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 17fda26721..29c14e148e 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -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"