diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:54 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 09:59:54 +0900 |
| commit | c425d361f5bf46d99cd96d7eac3488ebb2e92b60 (patch) | |
| tree | 9cfdd1b91fc759cb1e561c6302bbd9cfe37245ba /Documentation/diff-generate-patch.txt | |
| parent | cf0879f7e98d2213503622f780d2ab0dd3f93477 (diff) | |
| parent | d76ce4f734634f47b467b7f6eea11d6bf8c81f22 (diff) | |
| download | git-c425d361f5bf46d99cd96d7eac3488ebb2e92b60.tar.xz | |
Merge branch 'en/combined-all-paths'
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
Diffstat (limited to 'Documentation/diff-generate-patch.txt')
| -rw-r--r-- | Documentation/diff-generate-patch.txt | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt index 231105cff4..f10ca410ad 100644 --- a/Documentation/diff-generate-patch.txt +++ b/Documentation/diff-generate-patch.txt @@ -143,6 +143,19 @@ copying detection) are designed to work with diff of two Similar to two-line header for traditional 'unified' diff format, `/dev/null` is used to signal created or deleted files. ++ +However, if the --combined-all-paths option is provided, instead of a +two-line from-file/to-file you get a N+1 line from-file/to-file header, +where N is the number of parents in the merge commit + + --- a/file + --- a/file + --- a/file + +++ b/file ++ +This extended format can be useful if rename or copy detection is +active, to allow you to see the original name of the file in different +parents. 4. Chunk header format is modified to prevent people from accidentally feeding it to `patch -p1`. Combined diff format |