This patch series is sent to make it easy to test the changes in the
first patch by Junio of this series on a new "--keep" reset option.
Christian Couder (4):
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
Junio C Hamano (1):
reset: make "reset --merge" discard work tree changes on unmerged
entries
Documentation/git-reset.txt | 45 ++++++++++++++--
builtin-reset.c | 31 +++++++++--
read-cache.c | 2 +-
t/t7103-reset-bare.sh | 25 ++++++---
t/t7110-reset-merge.sh | 119 ++++++++++++++++++++++++++++++++++++++++---
unpack-trees.c | 19 ++++---
6 files changed, 206 insertions(+), 35 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