In this new version, some test cases have been added to show that the behavior of "git reset --merge" when there is a pending merge is changed by patch 2/4. And some commit messages have been improved, thanks to Junio. There is no documentation yet but I am working on it. Christian Couder (2): reset: add a few tests for "git reset --merge" reset: add test cases for "--merge-safe" option Stephan Beyer (2): reset: use "unpack_trees()" directly instead of "git read-tree" reset: add option "--merge-safe" to "git reset" builtin-reset.c | 81 ++++++++++++++++++++++------ t/t7110-reset-merge.sh | 142 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 207 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