aboutsummaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
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 17fda2672..29c14e148 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"