summaryrefslogtreecommitdiff
path: root/git-mv.perl
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-24 00:23:11 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-24 00:23:11 (GMT)
commitfbf8ac212caa74fc506434da83f8e9630b09ed12 (patch)
tree83c073bf924e3d478c98d65b112467c0ae21157b /git-mv.perl
parentb99a394cd1e7042ad219046a6ea81ad3f93004ca (diff)
downloadgit-fbf8ac212caa74fc506434da83f8e9630b09ed12.zip
git-fbf8ac212caa74fc506434da83f8e9630b09ed12.tar.gz
git-fbf8ac212caa74fc506434da83f8e9630b09ed12.tar.bz2
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>
Diffstat (limited to 'git-mv.perl')
0 files changed, 0 insertions, 0 deletions