summaryrefslogtreecommitdiff
path: root/git-pull.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-10 05:09:43 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-10 05:09:43 (GMT)
commit23ea3e201cea0deea909569e08e950a9ec2345f7 (patch)
tree614520079f232d1459467b6e718182a8721aadd5 /git-pull.sh
parent5ca15b8af7f018b9ae9da30130f9dcd1a896e0b3 (diff)
parenta1c292958f9968565f4048a17196d99fd16fc7ca (diff)
downloadgit-23ea3e201cea0deea909569e08e950a9ec2345f7.zip
git-23ea3e201cea0deea909569e08e950a9ec2345f7.tar.gz
git-23ea3e201cea0deea909569e08e950a9ec2345f7.tar.bz2
GIT 0.99.9gv0.99.9g
Another snapshot, as slow and steady marth towards 1.0 continues. Major changes include: - Jim Radford's RPM split. - Fredrik's recursive merge strategy is now default for two heads merge. - Yaacov's SVN importer updates. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-pull.sh')
-rwxr-xr-xgit-pull.sh16
1 files changed, 14 insertions, 2 deletions
diff --git a/git-pull.sh b/git-pull.sh
index 2358af6..3b875ad 100755
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -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