Thread (2 messages) flat view 2 messages, 2 authors, 2016-06-15

Re: [RFC 3/3] reset: Change the default behavior to use "--merge" during a merge

From: Andrew Wong <hidden>
Date: 2016-06-15 23:00:16

On 02/26/14 15:53, Junio C Hamano wrote:
 - start warning against "reset" (no mode specifier) and "reset --mixed"
   when the index is unmerged *and* MERGE_HEAD exists; and then
Why do we also want to check if index is unmerged? This situation can
happen regardless of having conflicts or not (--no-commit, aborting the
editor, etc.). As long as the user is in the middle of a merge
(MERGE_HEAD exists), shouldn't they be warned if they used "git reset"?
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help