development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-05 16:19:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Honor pull.{twohead,octopus} in git-merge.

Browse source 
If git-merge is invoked without a strategy argument it is probably
being run as a porcelain-ish command directly and is not being run
from within git-pull.  However we still should honor whatever merge
strategy the user may have selected in their configuration, just as
`git-pull .` would have.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Shawn O. Pearce 2006-12-28 02:35:05 -05:00 committed by Junio C Hamano
parent bf699582fd
commit de811948ba
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
git-merge.sh
View file

@ -227,9 +227,21 @@ case "$use_strategies" in
'')
case "$#" in
1)
use_strategies="$default_twohead_strategies" ;;
var="`git-repo-config --get pull.twohead`"
if test -n "$var"
then
use_strategies="$var"
else
use_strategies="$default_twohead_strategies"
fi ;;
*)
use_strategies="$default_octopus_strategies" ;;
var="`git-repo-config --get pull.octopus`"
if test -n "$var"
then
use_strategies="$var"
else
use_strategies="$default_octopus_strategies"
fi ;;
esac
;;
esac