diff options
| author |  Junio C Hamano <junkio@cox.net> | 2005-07-13 12:52:35 -0700 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 13:09:17 -0700 |
| commit | dda2d79af2d2858b37bab7f6e088d0730c0959d1 (patch) | |
| tree | 0252e50a800caa678f835ee26193e5f728459f0a /diff.h | |
| parent | [PATCH] git-diff-*: --name-only and --name-only-z. (diff) | |
| download | tgif-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.xz | |
[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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 20 |
1 files changed, 20 insertions, 0 deletions
@@ -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<file> reorder diffs according to the <file>.\n" \ +" -S<string> 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 |