summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-tree.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-12-20 03:32:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-12-20 03:35:55 (GMT)
commitefe05b019ca19328d27c07ef32b4698a7f36166f (patch)
treea38d3c5713d39370e881c148ff0f5c9d4db59c67 /Documentation/git-diff-tree.txt
parentec9f0ea3e6ecf1237223dec8428e7bb73d339320 (diff)
parent718258e256b74622aa55f5ee0cb9cff4cce6bf9f (diff)
downloadgit-efe05b019ca19328d27c07ef32b4698a7f36166f.zip
git-efe05b019ca19328d27c07ef32b4698a7f36166f.tar.gz
git-efe05b019ca19328d27c07ef32b4698a7f36166f.tar.bz2
Merge branch 'maint' to sync with GIT 1.6.0.6
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-diff-tree.txt')
-rw-r--r--Documentation/git-diff-tree.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index 5d48664..fdf8e7b 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -43,7 +43,7 @@ include::diff-options.txt[]
show tree entry itself as well as subtrees. Implies -r.
--root::
- When '--root' is specified the initial commit will be showed as a big
+ 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.
--stdin::