As agreed during private discussions, I am trying to refactor and merge some interesting bits of code from the GSoC sequencer project. So here is a first round about "git reset". Patches 1/4 and 2/4 are using sequencer code to speed up "git reset" and add some test cases for "git reset --merge". Patches 3/4 and 4/4 are implementing "git reset --merge-dirty" and showing the differences with "--merge". "--merge-dirty" is a really bad name for the index reset option that is available using the "allow_dirty" global variable in the sequencer. These 2 patches are for discussing this feature. Christian Couder (2): reset: add a few tests for "git reset --merge" reset: add test cases for "--merge-dirty" option Stephan Beyer (2): reset: use "unpack_trees()" directly instead of "git read-tree" reset: add option "--merge-dirty" to "git reset" builtin-reset.c | 81 +++++++++++++++++++++++++++------- t/t7110-reset-merge.sh | 114 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+), 16 deletions(-) create mode 100755 t/t7110-reset-merge.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