summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorChris Shoemaker <c.shoemaker@cox.net>2005-10-28 13:04:49 -0400
committerJunio C Hamano <junkio@cox.net>2005-10-28 13:37:38 -0700
commit50b8e355b64c93a71d5008557e15f52c032240ff (patch)
tree5958083eb0d27c933655ee5d77ef6848aaad2709 /diff.h
parentf07a524195a73537d4187460ccbd072bcb1ff486 (diff)
downloadgit-50b8e355b64c93a71d5008557e15f52c032240ff.tar.gz
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.h')
-rw-r--r--diff.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 51155479a4..12590791cb 100644
--- 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" \
-" -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" \