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 --git a/Documentation/git-diff-tree.txt b/Documentation/git-diff-tree.txt
index dcfb9e18c7041c005bfce0671bfda8b2ac31c656..f57c8d0d8191dae8be8db930ef8b38ddc9c42623 100644 (file)
--- 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
 --------
 
 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
 -----------
 
 DESCRIPTION
 -----------


@@ -33,6 +33,9 @@ include::diff-options.txt[]
        Note that this parameter does not provide any wildcard or regexp
        features.
 
        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.
 
 -t::
        show tree entry itself as well as subtrees.  Implies -r.
 

diff --git a/diff-tree.c b/diff-tree.c
index 382011a2a6d1a701aeb1104991d9abbfcb5b73df..ed323d877cad1e78e08f84c1e9ee1ebb09f05d91 100644 (file)
--- 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[] =
 }
 
 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)
 COMMON_DIFF_OPTIONS_HELP;
 
 int main(int argc, const char **argv)

diff --git a/diff.h b/diff.h
index 51155479a46857ee03aa5f5e005abdad63db5495..12590791cbefe8717891365b6d417f60c51f684f 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -91,7 +91,6 @@ extern void diffcore_std_no_resolve(struct diff_options *);
 
 #define COMMON_DIFF_OPTIONS_HELP \
 "\ncommon diff options:\n" \
 
 #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" \
 "  -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 3457a96cfd7a27ae4dffcf5d3f1ff2f9568bd83d..6ad96ebfbb06697a0ad0875274022d9103b24d0a 100755 (executable)
--- a/git-merge.sh
+++ b/git-merge.sh
@@ -25,7 +25,7 @@ dropsave() {
 
 savestate() {
        # Stash away any local modifications.
 
 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"
 }
 
        cpio -0 -o >"$GIT_DIR/MERGE_SAVE"
 }