On Wed, Mar 7, 2012 at 5:24 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: > Phil Hord <phil.hord@xxxxxxxxx> writes: > >> On Tue, Mar 6, 2012 at 2:24 PM, Junio C Hamano <gitster@xxxxxxxxx> wrote: >> ... >>> '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. If you goal is to say as little as possible, then yes. But I had to read the related commit messages several times before it dawned on me what the distinction was. The main problem was that I didn't understand that I was missing 'rerere.autoupdate=true' in my config, or why it mattered. I only know that rerere was letting me down sometimes, and 'rerere remaining' seemed to be missing some clearly-still-unresolved files. Thanks to this proposal, I understand it better now. But not from reading this email thread. Phil -- 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