mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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:
parent
f07a524195
commit
50b8e355b6
|
@ -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.
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
1
diff.h
1
diff.h
|
@ -91,7 +91,6 @@ extern void diffcore_std_no_resolve(struct diff_options *);
|
|||
|
||||
#define COMMON_DIFF_OPTIONS_HELP \
|
||||
"\ncommon diff options:\n" \
|
||||
" -r diff recursively (only meaningful in diff-tree)\n" \
|
||||
" -z output diff-raw with lines terminated with NUL.\n" \
|
||||
" -p output patch format.\n" \
|
||||
" -u synonym for -p.\n" \
|
||||
|
|
|
@ -25,7 +25,7 @@ dropsave() {
|
|||
|
||||
savestate() {
|
||||
# Stash away any local modifications.
|
||||
git-diff-index -r -z --name-only $head |
|
||||
git-diff-index -z --name-only $head |
|
||||
cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue