summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-08 10:00:31 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-10 02:56:29 (GMT)
commita1c292958f9968565f4048a17196d99fd16fc7ca (patch)
tree6466c53ae80cddbb581c5fdb2332f9321fade867 /debian
parent13956670a7baf4b3b794a2cc799bd501753f1746 (diff)
downloadgit-a1c292958f9968565f4048a17196d99fd16fc7ca.zip
git-a1c292958f9968565f4048a17196d99fd16fc7ca.tar.gz
git-a1c292958f9968565f4048a17196d99fd16fc7ca.tar.bz2
Make git-recursive the default strategy for git-pull.
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>
Diffstat (limited to 'debian')
0 files changed, 0 insertions, 0 deletions