diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-18 13:07:59 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-18 13:07:59 +0300 |
| commit | f5ef535ff571d80d230ea4706edad215f1fbc96f (patch) | |
| tree | f884c72d2853a179df94e3e738ebe27e12d65ab2 /git-pull.sh | |
| parent | 8a414ad50cd9edfe6c8f0a6b9b08df4aaa9ccb75 (diff) | |
git-pull: run repo-config with dash form.
... as discussed on the list for consistency.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
| -rwxr-xr-x | git-pull.sh | 4 |
1 files changed, 2 insertions, 2 deletions
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" |