summaryrefslogtreecommitdiff
path: root/shortlog.h
diff options
context:
space:
mode:
authorChristian Couder <chriscool@tuxfamily.org>2010-03-31 21:22:06 +0200
committerJunio C Hamano <gitster@pobox.com>2010-04-01 11:14:10 -0700
commit3f9083cde3b434155c274168f166ffce2bb243e7 (patch)
tree9b491020ae10227723d7ae47860686dec0331376 /shortlog.h
parentae8c79fd8fe47bfebf56ae83461cbedb934cff92 (diff)
downloadgit-3f9083cde3b434155c274168f166ffce2bb243e7.tar.gz
merge: refactor code that calls "git merge-STRATEGY"
In the try_merge_strategy() function, when the strategy is "recursive" or "subtree", the merge_recursive() function is called. Otherwise we launch a "git merge-STRATEGY" process. To make it possible to reuse code that launches a "git merge-STRATEGY" process, this patch refactors this code into a new try_merge_command() function. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'shortlog.h')
0 files changed, 0 insertions, 0 deletions