From dda2d79af2d2858b37bab7f6e088d0730c0959d1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 13 Jul 2005 12:52:35 -0700 Subject: [PATCH] Clean up diff option descriptions. I got tired of maintaining almost duplicated descriptions in diff-* brothers, both in usage string and documentation. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff.h | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'diff.h') diff --git a/diff.h b/diff.h index 46c0e236c3..9f9ca8be5b 100644 --- a/diff.h +++ b/diff.h @@ -53,6 +53,26 @@ extern void diffcore_std_no_resolve(const char **paths, const char *pickaxe, int pickaxe_opts, const char *orderfile, const char *filter); +#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" \ +" --name-only show only names of changed files.\n" \ +" --name-only-z\n" \ +" same as --name-only but terminate lines with NUL.\n" \ +" -R swap input file pairs.\n" \ +" -B detect complete rewrites.\n" \ +" -M detect renames.\n" \ +" -C detect copies.\n" \ +" --find-copies-harder\n" \ +" try unchanged files as candidate for copy detection.\n" \ +" -O reorder diffs according to the .\n" \ +" -S find filepair whose only one side contains the string.\n" \ +" --pickaxe-all\n" \ +" show all files diff when -S is used and hit is found.\n" + extern int diff_queue_is_empty(void); #define DIFF_FORMAT_HUMAN 0 -- cgit v1.2.3