diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-18 02:08:10 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-18 02:08:10 -0800 |
| commit | 2fc27528f6d3f8c90d9ea38c8c70c83fbfe523d7 (patch) | |
| tree | 798681552ccd1f99d66dedbf0432cb675914b78d | |
| parent | c534c4ba7e01cc77e1470b91d1b090289410971b (diff) | |
| parent | f5ef535ff571d80d230ea4706edad215f1fbc96f (diff) | |
| download | git-2fc27528f6d3f8c90d9ea38c8c70c83fbfe523d7.tar.gz | |
Merge branch 'master' into next
* master:
git-pull: run repo-config with dash form.
| -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" |