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

Re: [PATCH] Documentation/git-rerere: document 'remaining' command

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:53:14

Phil Hord [off-list ref] writes:
On Tue, Mar 6, 2012 at 2:24 PM, Junio C Hamano [off-list ref] wrote:
...
quoted
       'remaining'::

       Print paths with conflicts that are not resolved.

Should be sufficient, I think.
....  'mergetool' uses this command to
avoid asking the user to resolve files which git rerere already
resolved for her.
Ok, so "Print paths with conflicts that are not resolved." indeed is
sufficient.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help