From 50b8e355b64c93a71d5008557e15f52c032240ff Mon Sep 17 00:00:00 2001 From: Chris Shoemaker Date: Fri, 28 Oct 2005 13:04:49 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- diff.h | 1 - 1 file changed, 1 deletion(-) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 51155479a..12590791c 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" \ -- cgit v1.2.1