Elijah Newren <newren@xxxxxxxxx> writes: > On Thu, Feb 7, 2019 at 8:00 PM Junio C Hamano <gitster@xxxxxxxxx> wrote: >> >> Elijah Newren <newren@xxxxxxxxx> writes: >> >> > +For `-c` and `--cc`, only the destination or final path is shown even >> > +if the file was renamed on any side of history. With >> > +`--combined-all-paths`, the name of the path in each parent is shown >> > +followed by the name of the path in the merge commit. >> > + >> > +Examples for `-c` and `-cc` without `--combined-all-paths`: >> >> s/-cc/--cc/ > > Thanks for catching that. I was going to go fixup and resubmit, and > drop patch 2 while at it, but it looks like you've already squashed > this fix in to commit d76ce4f73 that you've pushed out to pu. Do you > want to just drop patch two from that series and call it good? Sure. Thanks.
