Re: [PATCH v5 1/2] log,diff-tree: add --combined-all-paths option

2019-02-08 Thread Junio C Hamano
Elijah Newren writes: > On Thu, Feb 7, 2019 at 8:00 PM Junio C Hamano wrote: >> >> Elijah Newren 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

Re: [PATCH v5 1/2] log,diff-tree: add --combined-all-paths option

2019-02-07 Thread Elijah Newren
On Thu, Feb 7, 2019 at 8:00 PM Junio C Hamano wrote: > > Elijah Newren 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 > > +fol

Re: [PATCH v5 1/2] log,diff-tree: add --combined-all-paths option

2019-02-07 Thread Junio C Hamano
Elijah Newren 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

[PATCH v5 1/2] log,diff-tree: add --combined-all-paths option

2019-02-07 Thread Elijah Newren
The combined diff format for merges will only list one filename, even if rename or copy detection is active. For example, with raw format one might see: ::100644 100644 100644 fabadb8 cc95eb0 4866510 MM describe.c ::100755 100755 100755 52b7a2d 6d1ac04 d2ac7d7 RM bar.sh ::100644 100