diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-09-23 18:51:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-23 18:51:02 -0700 |
| commit | a61399b5fb7f4b04d60f42b253cb0f684bcdd286 (patch) | |
| tree | 1df99e7bb47996ec765328a5adedc62f6340e8fe /Documentation/git-diff-tree.txt | |
| parent | 990f856a62a24bfd56bac1f5e4581381369e4ede (diff) | |
| parent | dc56bc034176d76ce95e9ba7636e3551d51dc897 (diff) | |
| download | git-a61399b5fb7f4b04d60f42b253cb0f684bcdd286.tar.xz | |
Merge 'fixes' branch
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
| -rw-r--r-- | Documentation/git-diff-tree.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index 9ec4b29ff7..816c592ebf 100644 --- a/Documentation/git-diff-tree.txt +++ b/Documentation/git-diff-tree.txt @@ -9,12 +9,15 @@ git-diff-tree - Compares the content and mode of blobs found via two tree object SYNOPSIS -------- -'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> <tree-ish> [<path>...] +'git-diff-tree' [--stdin] [-m] [-s] [-v] [--pretty] [-t] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...] DESCRIPTION ----------- Compares the content and mode of the blobs found via two tree objects. +If there is only one <tree-ish> given, the commit is compared with its parents +(see --stdin below). + Note that "git-diff-tree" can use the tree encapsulated in a commit object. OPTIONS |