From: Junio C Hamano <junkio@cox.net>
Date: Sat, 18 Mar 2006 10:07:59 +0000 (-0800)
Subject: git-pull: run repo-config with dash form.
X-Git-Tag: v1.3.0-rc1~20^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f5ef535ff571d80d230ea4706edad215f1fbc96f;p=git.git

git-pull: run repo-config with dash form.

... as discussed on the list for consistency.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

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"