The purpose of this series is to make it possible to test how "git cherry-pick" would work with another merge strategy than the recursive one. Junio suggested: "It might not be a bad idea to teach a hidden primarily-for-debugging option to "cherry-pick" to let it use resolve instead of recursive for cases like this." The changes since the previous RFC version are the following: - the commit messages of the first 2 patches have been improved a little, - some calls to free_commit_list() have been added to the last patch, - the series was rebased recently on top of next. Christian Couder (5): revert: use strbuf to refactor the code that writes the merge message revert: refactor merge recursive code into its own function merge: refactor code that calls "git merge-STRATEGY" merge: make function try_merge_command non static revert: add "--strategy" option to choose merge strategy builtin/merge.c | 81 +++++++++++++----------- builtin/revert.c | 179 +++++++++++++++++++++++++++++++---------------------- cache.h | 3 - merge-recursive.h | 4 + 4 files changed, 154 insertions(+), 113 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html