diff options
| author | Tom Prince <tom.prince@ualberta.net> | 2007-01-29 03:16:53 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-01-29 03:16:53 +0300 |
| commit | e0d10e1c63bc52b37bbec99b07deee794058d9b4 (patch) | |
| tree | 6fa070c660ff481e226b10aadbec5b7bb3b95cc7 /git-merge.sh | |
| parent | 829a686f1b50ba96cac2d88494fa339efe0c0862 (diff) | |
[PATCH] Rename git-repo-config to git-config.
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge.sh')
| -rwxr-xr-x | git-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/git-merge.sh b/git-merge.sh index 656869101a..04a5eb0f29 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -233,7 +233,7 @@ case "$use_strategies" in '') case "$#" in 1) - var="`git-repo-config --get pull.twohead`" + var="`git-config --get pull.twohead`" if test -n "$var" then use_strategies="$var" @@ -241,7 +241,7 @@ case "$use_strategies" in use_strategies="$default_twohead_strategies" fi ;; *) - var="`git-repo-config --get pull.octopus`" + var="`git-config --get pull.octopus`" if test -n "$var" then use_strategies="$var" |