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 /git-diff-tree.txt | |
| parent | 9149123b58ede4ca92a71abd3c09e3e2ad205b55 (diff) | |
| download | git-htmldocs-11f1537a82c84e620d742b3bc4256952defb28df.tar.gz | |
Autogenerated HTML docs for v2.21.0-135-g6e0cc
Diffstat (limited to 'git-diff-tree.txt')
| -rw-r--r-- | git-diff-tree.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 43daa7c04..24f32e8c5 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -10,8 +10,8 @@ SYNOPSIS -------- [verse] 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] - [-t] [-r] [-c | --cc] [--root] [<common diff options>] - <tree-ish> [<tree-ish>] [<path>...] + [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] + [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] DESCRIPTION ----------- @@ -105,6 +105,13 @@ include::pretty-options.txt[] itself and the commit log message is not shown, just like in any other "empty diff" case. +--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). + --always:: Show the commit itself and the commit log message even if the diff itself is empty. |