This is a reroll of a previous series from last september: http://thread.gmane.org/gmane.comp.version-control.git/128706/focus=128707 The changes in this reroll are the following: - new option was renamed "--keep-local-changes" instead of "--merge-safe", - some test cases have been added, - a bug was fixed (head_sha1 is now "unsigned char head_sha1[20]"), - I took ownership of the third patch, - some commit messages were improved, - there are 2 new documentation patches at the end, - the last documentation patch adds some tables about what all the reset options are doing in the different cases. The new option name is "--keep-local-changes" because that's what Junio used in the last email of the previous discussion, but my opinion is that it is a bit long and so I'd like to rename it "--keep" or another such short name. Christian Couder (5): reset: add a few tests for "git reset --merge" reset: add option "--keep-local-changes" to "git reset" reset: add test cases for "--keep-local-changes" option Documentation: reset: describe new "--keep-local-changes" option Documentation: reset: add some tables to describe the different options Stephan Beyer (1): reset: use "unpack_trees()" directly instead of "git read-tree" Documentation/git-reset.txt | 80 ++++++++++++++++++++++- builtin-reset.c | 81 ++++++++++++++++++----- t/t7110-reset-merge.sh | 156 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 300 insertions(+), 17 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