development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Let merge set the default strategy.

Browse source 
If the user does not set a merge strategy for git-pull,
let git-merge calculate a default strategy.

[jc: with minor stylistic tweaks]

Signed-off-by: Mark Hollomon <markhollomon@comcast.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Mark Hollomon 2006-03-15 22:51:41 +00:00 committed by Junio C Hamano
parent c982647310
commit c8e2db00f9
1 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
git-pull.sh
View file

@ -71,19 +71,15 @@ case "$merge_head" in
;;
?*' '?*)
var=`git repo-config --get pull.octopus`
if test '' = "$var"
if test -n "$var"
then
strategy_default_args='-s octopus'
else
strategy_default_args="-s $var"
fi
;;
*)
var=`git repo-config --get pull.twohead`
if test '' = "$var"
then
strategy_default_args='-s recursive'
else
if test -n "$var"
then
strategy_default_args="-s $var"
fi
;;