From f5ef535ff571d80d230ea4706edad215f1fbc96f Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 18 Mar 2006 02:07:59 -0800 Subject: [PATCH] git-pull: run repo-config with dash form. ... as discussed on the list for consistency. Signed-off-by: Junio C Hamano --- git-pull.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/git-pull.sh b/git-pull.sh index 17fda267..29c14e14 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" -- 2.11.0