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/rev-list-options.txt | |
| parent | cf0879f7e98d2213503622f780d2ab0dd3f93477 (diff) | |
| parent | d76ce4f734634f47b467b7f6eea11d6bf8c81f22 (diff) | |
| download | git-c425d361f5bf46d99cd96d7eac3488ebb2e92b60.tar.gz | |
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/rev-list-options.txt')
| -rw-r--r-- | Documentation/rev-list-options.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index cad711ce0a..ca959a7286 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -960,6 +960,13 @@ options may be given. See linkgit:git-diff-files[1] for more options. the parents have only two variants and the merge result picks one of them without modification. +--combined-all-paths:: + This flag causes combined diffs (used for merge commits) to + list the name of the file from all parents. It thus only has + effect when -c or --cc are specified, and is likely only + useful if filename changes are detected (i.e. when either + rename or copy detection have been requested). + -m:: This flag makes the merge commits show the full diff like regular commits; for each merge parent, a separate log entry |