From: Christian Couder <chriscool@tuxfamily.org>
Date: Wed, 16 Sep 2009 04:14:38 GMT
Subject: [PATCH v2 0/4] "git reset --merge" related improvements
Message-ID: <20090916035131.3737.33020.chriscool@tuxfamily.org>

In this new version, the test cases that were bogus are now fixed. And
the new "git reset" option is now called "--merge-safe" (instead of
"--merge-dirty").

To make the test cases pass I had to change a little bit the way
"--merge-safe" is implemented. It now does not set the "reset" flag in the
"struct unpack_trees_options" passed to "unpack_trees()". 

And commit messages have been improved, thanks to input from Daniel, Junio
and Linus. And there is no more "exec </dev/null" in the test script, thanks
to Jakub.

I prefer to keep Stephan as the author of patch 3/4 because he designed and
implemented the new feature in the first place.

I am working on the documentation for "--merge-safe" and on improving the
existing "git reset" documentation using a table at the same time. So
another patch will be added to this series later.

Christian Couder (2):
  reset: add a few tests for "git reset --merge"
  reset: add test cases for "--merge-safe" option

Stephan Beyer (2):
  reset: use "unpack_trees()" directly instead of "git read-tree"
  reset: add option "--merge-safe" to "git reset"

 builtin-reset.c        |   81 ++++++++++++++++++++++++++++-------
 t/t7110-reset-merge.sh |  112 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+), 16 deletions(-)
 create mode 100755 t/t7110-reset-merge.sh