diff options
| author | Chris Shoemaker <c.shoemaker@cox.net> | 2005-10-28 17:04:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-28 20:37:38 (GMT) |
| commit | 50b8e355b64c93a71d5008557e15f52c032240ff (patch) | |
| tree | 5958083eb0d27c933655ee5d77ef6848aaad2709 /diff-tree.c | |
| parent | f07a524195a73537d4187460ccbd072bcb1ff486 (diff) | |
| download | git-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 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/diff-tree.c b/diff-tree.c index 382011a..ed323d8 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) |