Changes since the previous series are the following: - removed parts of the commit message that contrasted "--keep" with "--merge" - improved wording in the documentation - added a new patch to disallow "--keep" when there are unmerged entries - added some tests for --keep in t7111-reset-table.sh Christian Couder (5): reset: add option "--keep" to "git reset" reset: add test cases for "--keep" option Documentation: reset: describe new "--keep" option reset: disallow "reset --keep" outside a work tree reset: disallow using --keep when there are unmerged entries Documentation/git-reset.txt | 48 +++++++++++++++++- builtin-reset.c | 46 ++++++++++++++--- t/t7103-reset-bare.sh | 25 ++++++--- t/t7110-reset-merge.sh | 116 ++++++++++++++++++++++++++++++++++++++++++- t/t7111-reset-table.sh | 8 +++ 5 files changed, 223 insertions(+), 20 deletions(-) -- 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