From: Christian Couder Date: Thu, 25 Mar 2010 04:58:12 GMT Subject: [RFC/PATCH 0/5] add a --strategy option to "git cherry-pick" Message-ID: <20100325045519.14832.65964.chriscool@tuxfamily.org> 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." 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 | 174 ++++++++++++++++++++++++++++++---------------------- cache.h | 3 - merge-recursive.h | 4 + 4 files changed, 149 insertions(+), 113 deletions(-)