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>
This commit is contained in:

committed by
Junio C Hamano

parent
f07a524195
commit
50b8e355b6
@ -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)
|
||||
|
Reference in New Issue
Block a user