Merge branch 'en/combined-all-paths'
authorJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:54 +0000 (09:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Thu, 7 Mar 2019 00:59:54 +0000 (09:59 +0900)
Output from "diff --cc" did not show the original paths when the
merge involved renames. A new option adds the paths in the
original trees to the output.

* en/combined-all-paths:
log,diff-tree: add --combined-all-paths option

1  2 
Documentation/git-diff-tree.txt
Documentation/rev-list-options.txt
builtin/diff-tree.c
combine-diff.c
diff.h
revision.c
revision.h
Simple merge
Simple merge
Simple merge
diff --cc combine-diff.c
Simple merge
diff --cc diff.h
Simple merge
diff --cc revision.c
Simple merge
diff --cc revision.h
Simple merge