diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-09-23 18:46:34 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-09-23 18:46:34 -0700 |
| commit | 348c4c66dacb1810a9bcd592e72f98a465233488 (patch) | |
| tree | 208ffd12b459d6506302f219cac52288e4a38290 /Documentation | |
| parent | Merge branch 'fixes' (diff) | |
| parent | Further clarify licensing status of compat/subprocess.py. (diff) | |
| download | tgif-348c4c66dacb1810a9bcd592e72f98a465233488.tar.xz | |
Merge 'fixes' branch.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation')
| -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 5aa4adcc4c..7f18bbfc60 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 |