diff options
| author | Chris Shoemaker <c.shoemaker@cox.net> | 2005-10-28 13:04:49 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-10-28 13:37:38 -0700 |
| commit | 50b8e355b64c93a71d5008557e15f52c032240ff (patch) | |
| tree | 5958083eb0d27c933655ee5d77ef6848aaad2709 | |
| parent | f07a524195a73537d4187460ccbd072bcb1ff486 (diff) | |
| download | git-50b8e355b64c93a71d5008557e15f52c032240ff.tar.gz git-50b8e355b64c93a71d5008557e15f52c032240ff.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-diff-tree.txt | 5 | ||||
| -rw-r--r-- | diff-tree.c | 6 | ||||
| -rw-r--r-- | diff.h | 1 | ||||
| -rwxr-xr-x | git-merge.sh | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt index dcfb9e18c..f57c8d0d8 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. diff --git a/diff-tree.c b/diff-tree.c index 382011a2a..ed323d877 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) @@ -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" \ diff --git a/git-merge.sh b/git-merge.sh index 3457a96cf..6ad96ebfb 100755 --- a/git-merge.sh +++ b/git-merge.sh @@ -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" } |