Junio C Hamano <gitster@xxxxxxxxx> writes: > Elijah Newren <newren@xxxxxxxxx> writes: > >>> > +--cc:: >>> > + Produce dense combined diff output for merge commits. >>> > + Shortcut for '--diff-merges=dense-combined -p'. >>> >>> Good. >>> >>> > +--remerge-diff:: >>> > + Produce diff against re-merge. >>> > + Shortcut for '--diff-merges=remerge -p'. >>> ... >> Perhaps: >> >> Produce remerge-diff output for merge commits, in order to show how >> conflicts were resolved. > > I do not mind it, but then I'd prefer to see ", in order to show > how" also in the description of "--cc" and "-c" for consistency. > > A succinct way to say what they do may be hard to come by, but I > think of them showing places that did not have obvious natural > resolution. So, is it OK with both of you if I leave it as: "Produce remerge-diff output for merge commits." for now, and let you tweak the descriptions later on, if needed? Thanks, -- Sergey Organov
