Changes since the previous series are the following: - added some tests in a new patch - added some documentation in a new patch - added a patch to use the new "reset" function in builtin-merge.c - made --ff incompatible with --edit -x and --signoff too, thanks to Paolo - improved the first patch with suggestions from Stephen Boyd, thanks - made a "struct lock_file" static to initialize it in the first patch - improved commit messages Christian Couder (8): reset: refactor updating heads into a static function reset: refactor reseting in its own function reset: make reset function non static and declare it in "reset.h" revert: add --ff option to allow fast forward when cherry-picking cherry-pick: add tests for new --ff option Documentation: describe new cherry-pick --ff option rebase -i: use new --ff cherry-pick option merge: use new "reset" function instead of running "git read-tree" Stephan Beyer (1): revert: libify cherry-pick and revert functionnality Documentation/git-cherry-pick.txt | 6 +- Makefile | 2 + builtin-merge.c | 31 ++--- builtin-reset.c | 175 ++++++++++++---------- builtin-revert.c | 303 +++++++++---------------------------- git-rebase--interactive.sh | 15 +-- pick.c | 218 ++++++++++++++++++++++++++ pick.h | 13 ++ reset.h | 10 ++ t/t3506-cherry-pick-ff.sh | 38 +++++ 10 files changed, 471 insertions(+), 340 deletions(-) create mode 100644 pick.c create mode 100644 pick.h create mode 100644 reset.h 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