The goal of this patch series is to make it possible for "git cherry-pick" to fast forward instead of creating a new commit if the cherry picked commit has the same parent as the one we are cherry-picking on. The big change since previous version is that the first patches to implement the --ff option are based on what Junio suggested. Christian Couder (4): cherry-pick: add tests for new --ff option Documentation: describe new cherry-pick --ff option cherry-pick: add a no-op --no-ff option to future proof scripts rebase -i: use new --ff cherry-pick option Junio C Hamano (3): parse-options: add parse_options_concat() to concat options builtin/merge: make checkout_fast_forward() non static revert: add --ff option to allow fast forward when cherry-picking Documentation/git-cherry-pick.txt | 10 +++- builtin/merge.c | 2 +- builtin/revert.c | 47 +++++++++++++++- cache.h | 3 + git-rebase--interactive.sh | 15 +---- parse-options.c | 15 +++++ parse-options.h | 1 + t/t3506-cherry-pick-ff.sh | 106 +++++++++++++++++++++++++++++++++++++ 8 files changed, 182 insertions(+), 17 deletions(-) create mode 100755 t/t3506-cherry-pick-ff.sh -- 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