From 50b8e355b64c93a71d5008557e15f52c032240ff Mon Sep 17 00:00:00 2001
From: Chris Shoemaker <c.shoemaker@cox.net>
Date: Fri, 28 Oct 2005 13:04:49 -0400
Subject: 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>
---
 diff-tree.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'diff-tree.c')

diff --git a/diff-tree.c b/diff-tree.c
index 382011a2a6..ed323d877c 100644
--- a/diff-tree.c
+++ b/diff-tree.c
@@ -149,8 +149,10 @@ static int diff_tree_stdin(char *line)
 }
 
 static const char diff_tree_usage[] =
-"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
-"[<common diff options>] <tree-ish> <tree-ish>"
+"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-r] [--root] "
+"[<common diff options>] <tree-ish> [<tree-ish>] [<path>...]\n"
+"  -r            diff recursively\n"
+"  --root        include the initial commit as diff against /dev/null\n"
 COMMON_DIFF_OPTIONS_HELP;
 
 int main(int argc, const char **argv)
-- 
cgit v1.2.3