| commit | fbf8ac212caa74fc506434da83f8e9630b09ed12 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Thu, 24 Nov 2005 00:23:11 +0000 (23 16:23 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Thu, 24 Nov 2005 00:23:11 +0000 (23 16:23 -0800) | ||
| tree | 83c073bf924e3d478c98d65b112467c0ae21157b | treesnapshot (tar.gz zip) |
| parent | b99a394cd1e7042ad219046a6ea81ad3f93004ca | commitdiff |
git-merge: make recursive the default strategy
git-pull invoked merge with recursive as the default strategy
for some time now; match it in the git-merge itself. Also avoid
listing more than one strategy on default because we have only
one strategy that can resolve an octopus and we are already
counting heads here. This reduces the need to stash away local
modifications.
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-pull invoked merge with recursive as the default strategy
for some time now; match it in the git-merge itself. Also avoid
listing more than one strategy on default because we have only
one strategy that can resolve an octopus and we are already
counting heads here. This reduces the need to stash away local
modifications.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| git-merge.sh | diffblobblamehistory |