mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Rename git-repo-config to git-config.

Browse Source 
Signed-off-by: Tom Prince <tom.prince@ualberta.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Tom Prince
2007-01-28 16:16:53 -08:00
committed by Junio C Hamano
parent 829a686f1b
commit e0d10e1c63
58 changed files with 460 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
git-merge.sh
View File

@ -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"