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"