![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 4 Dec 2008 02:00:12 +0000 (18:00 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 10 Dec 2008 05:42:44 +0000 (21:42 -0800) | ||
| commit | 1b5b465fbde9515e04bd1e8524a208c92af3555e | |
| tree | d00c3e751d8ddee85e01d034f912419eb49afb3f | tree | snapshot |
| parent | 9e8eceab73e9f6a1e9349b1c14d4db0c035ac1ba | commit | diff |
Document "git-reset --merge"
The commit log message for the feature made it sound as if this is a saner
version of --mixed, but the use case presented makes it clear that it is a
better variant of --hard when your changes and somebody else's changes are
mixed together.
Perhaps we would want to rewrite the example that shows the use of --hard
not to talk about recovering from a failed merge?
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The commit log message for the feature made it sound as if this is a saner
version of --mixed, but the use case presented makes it clear that it is a
better variant of --hard when your changes and somebody else's changes are
mixed together.
Perhaps we would want to rewrite the example that shows the use of --hard
not to talk about recovering from a failed merge?
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-reset.txt | diff | blob | history |