Another reroll with the following changes:
- the name of the new option is now "--keep" instead of "--keep-local-changes",
- the fill_tree_descriptor() function is used instead of adding a new
parse_and_init_tree_desc() function (thanks to Stephen Boyd),
- patch 1/7 was added to only accept soft reset when not in a working tree;
this makes the test suite pass,
- the commit message of patch 4/7 that adds the --keep option has been
improved; it talks more about the use case of this new option.
Christian Couder (6):
reset: do not accept a mixed reset in a .git dir
reset: add a few tests for "git reset --merge"
reset: add option "--keep" to "git reset"
reset: add test cases for "--keep" option
Documentation: reset: describe new "--keep" 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 | 79 +++++++++++++++++++++-
builtin-reset.c | 74 +++++++++++++++-----
t/t7103-reset-bare.sh | 4 +-
t/t7110-reset-merge.sh | 156 +++++++++++++++++++++++++++++++++++++++++++
4 files changed, 292 insertions(+), 21 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