Merge branch 'master' into next

* master: git-pull: run repo-config with dash form.
19 years ago · 2fc27528f6
1 changed files with 2 additions and 2 deletions
--- a/git-pull.sh
+++ b/git-pull.sh
@ -70,14 +70,14 @@ case "$merge_head" in
				@@ -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"