Another reroll with the following changes:
- patches to add --keep option have been removed for now
- documentation patch has been moved before the core code changes
- commit messages have been improved
- tests have been much improved thanks to Junio's suggestions
Christian Couder (3):
reset: improve mixed reset error message when in a bare repo
Documentation: reset: add some tables to describe the different
options
reset: add a few tests for "git reset --merge"
Stephan Beyer (1):
reset: use "unpack_trees()" directly instead of "git read-tree"
Documentation/git-reset.txt | 66 ++++++++++++++++++
builtin-reset.c | 45 +++++++++---
t/t7110-reset-merge.sh | 161 +++++++++++++++++++++++++++++++++++++++++++
3 files changed, 261 insertions(+), 11 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