Merge branch 'master' into next

Junio C Hamano · Junio C Hamano · commit 2fc27528f6d3 · 2006-03-18T02:08:10.000-08:00
* master:
  git-pull: run repo-config with dash form.
diff --git 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"
