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

Make git-recursive the default strategy for git-pull.

Browse source 
This does two things:

 - It changes the hardcoded default merge strategy for two-head
   git-pull from resolve to recursive.

 - .git/config file acquires two configuration items.
   pull.twohead names the strategy for two-head case, and
   pull.octopus names the strategy for octopus merge.

IOW you are paranoid, you can have the following lines in your
.git/config file and keep using git-merge-resolve when pulling
one remote:

	[pull]
		twohead = resolve

OTOH, you can say this:

	[pull]
		twohead = resolve
		twohead = recursive

to try quicker resolve first, and when it fails, fall back to
recursive.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2005-11-08 02:00:31 -08:00
parent 13956670a7
commit a1c292958f
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-pull.sh
View file

@ -79,10 +79,22 @@ case "$merge_head" in
exit 0
;;
?*' '?*)
strategy_default_args='-s octopus'
var=`git-var -l | sed -ne 's/^pull\.octopus=/-s /p'`
if test '' = "$var"
then
strategy_default_args='-s octopus'
else
strategy_default_args=$var
fi
;;
*)
strategy_default_args='-s resolve'
var=`git-var -l | sed -ne 's/^pull\.twohead=/-s /p'`
if test '' = "$var"
then
strategy_default_args='-s recursive'
else
strategy_default_args=$var
fi
;;
esac