On Thu, 10 Sep 2009, Christian Couder wrote:
This shows that with the "--merge-dirty" option,
changes that are both in the work tree and the index are kept
in the work tree after the reset (but discarded in the index). As with
the "--merge" option,
changes that are in both the work tree and the index are discarded
after the reset.
I'm lost here.
If you have:
working index HEAD target
version B B A A
You get:
working index HEAD target
--m-d B A A A
--merge A A A A
?
> ---
> t/t7110-reset-merge.sh | 54 +++++++++++++++++++++++++++++++++++++++++++----
> 1 files changed, 49 insertions(+), 5 deletions(-)
>
> diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
> index 45714ae..1e6d634 100755
> --- a/t/t7110-reset-merge.sh
> +++ b/t/t7110-reset-merge.sh
> @@ -19,7 +19,7 @@ test_expect_success 'creating initial files' '
> git commit -m "Initial commit"
> '
>
> -test_expect_success 'ok with changes in file not changed by reset' '
> +test_expect_success '--merge: ok if changes in file not touched by reset' '
Should probably have the "--merge: " from the beginning, since you're
adding the test in this series anyway. That would make the diff come out
clearer.
-Daniel
*This .sig left intentionally blank*
--
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