summaryrefslogtreecommitdiff
path: root/Documentation/git-diff-tree.txt
diff options
context:
space:
mode:
authorChris Shoemaker <c.shoemaker@cox.net>2005-10-28 17:04:49 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-10-28 20:37:38 (GMT)
commit50b8e355b64c93a71d5008557e15f52c032240ff (patch)
tree5958083eb0d27c933655ee5d77ef6848aaad2709 /Documentation/git-diff-tree.txt
parentf07a524195a73537d4187460ccbd072bcb1ff486 (diff)
downloadgit-50b8e355b64c93a71d5008557e15f52c032240ff.zip
git-50b8e355b64c93a71d5008557e15f52c032240ff.tar.gz
git-50b8e355b64c93a71d5008557e15f52c032240ff.tar.bz2
Documentation changes to recursive option for git-diff-tree
Update docs and usages regarding '-r' recursive option for git-diff-tree. Remove '-r' from common diff options, mention it only for git-diff-tree. Remove one extraneous use of '-r' with git-diff-files in get-merge.sh. Sync the synopsis and usage string for git-diff-tree. Signed-off-by: Chris Shoemaker <c.shoemaker at cox.net> 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 dcfb9e1..f57c8d0 100644
--- a/Documentation/git-diff-tree.txt
+++ b/Documentation/git-diff-tree.txt
@@ -8,7 +8,7 @@ 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] [-r] [--root] [<common diff options>] <tree-ish> [<tree-ish>] [<path>...]
DESCRIPTION
-----------
@@ -33,6 +33,9 @@ include::diff-options.txt[]
Note that this parameter does not provide any wildcard or regexp
features.
+-r::
+ recurse into sub-trees
+
-t::
show tree entry itself as well as subtrees. Implies -r.