summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-09-24 01:46:34 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-24 01:46:34 (GMT)
commit348c4c66dacb1810a9bcd592e72f98a465233488 (patch)
tree208ffd12b459d6506302f219cac52288e4a38290 /Documentation/git-diff-tree.txt
parent7fe2fc79358673a909d71e62d3f80ffe0f525fce (diff)
parentdc56bc034176d76ce95e9ba7636e3551d51dc897 (diff)
downloadgit-348c4c66dacb1810a9bcd592e72f98a465233488.zip
git-348c4c66dacb1810a9bcd592e72f98a465233488.tar.gz
git-348c4c66dacb1810a9bcd592e72f98a465233488.tar.bz2
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.txt5
1 files changed, 4 insertions, 1 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 5aa4adc..7f18bbf 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