diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-02 14:05:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 14:05:05 -0800 |
| commit | df3d3cddff51ef14a454394a9977e899f72b8244 (patch) | |
| tree | b6f9a3c1f550494dd1bb439f3b1cb05067ce621a /git-diff-tree.txt | |
| parent | b8e9cfb64bf7192e3861ff1b72d169e7d1554be9 (diff) | |
| download | git-htmldocs-df3d3cddff51ef14a454394a9977e899f72b8244.tar.gz | |
Autogenerated HTML docs for v2.29.2-154-g7f7eb
Diffstat (limited to 'git-diff-tree.txt')
| -rw-r--r-- | git-diff-tree.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/git-diff-tree.txt b/git-diff-tree.txt index 5c8a2a5e9..2fc24c542 100644 --- a/git-diff-tree.txt +++ b/git-diff-tree.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git diff-tree' [--stdin] [-m] [-s] [-v] [--no-commit-id] [--pretty] - [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] + [-t] [-r] [-c | --cc] [--combined-all-paths] [--root] [--merge-base] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] DESCRIPTION @@ -43,6 +43,11 @@ include::diff-options.txt[] When `--root` is specified the initial commit will be shown as a big creation event. This is equivalent to a diff against the NULL tree. +--merge-base:: + Instead of comparing the <tree-ish>s directly, use the merge + base between the two <tree-ish>s as the "before" side. There + must be two <tree-ish>s given and they must both be commits. + --stdin:: When `--stdin` is specified, the command does not take <tree-ish> arguments from the command line. Instead, it |