diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-03-07 12:17:00 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-03-07 12:17:00 +0900 |
| commit | 11f1537a82c84e620d742b3bc4256952defb28df (patch) | |
| tree | 2923ff40fbf10f29b7eaa506c2deb52e00e08dde /rev-list-options.txt | |
| parent | 9149123b58ede4ca92a71abd3c09e3e2ad205b55 (diff) | |
| download | git-htmldocs-11f1537a82c84e620d742b3bc4256952defb28df.tar.gz | |
Autogenerated HTML docs for v2.21.0-135-g6e0cc
Diffstat (limited to 'rev-list-options.txt')
| -rw-r--r-- | rev-list-options.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/rev-list-options.txt b/rev-list-options.txt index cad711ce0..ca959a728 100644 --- a/rev-list-options.txt +++ b/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 |