diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-07-13 19:52:35 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-13 20:09:17 (GMT) |
| commit | dda2d79af2d2858b37bab7f6e088d0730c0959d1 (patch) | |
| tree | 0252e50a800caa678f835ee26193e5f728459f0a /diff-stages.c | |
| parent | 52f28529f4f90cebdca47f8eacbff5cb20004bed (diff) | |
| download | git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.zip git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.gz git-dda2d79af2d2858b37bab7f6e088d0730c0959d1.tar.bz2 | |
[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-stages.c')
| -rw-r--r-- | diff-stages.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/diff-stages.c b/diff-stages.c index 9d33535..8d86d74 100644 --- a/diff-stages.c +++ b/diff-stages.c @@ -17,7 +17,8 @@ static const char *orderfile = NULL; static const char *diff_filter = NULL; static char *diff_stages_usage = -"git-diff-stages [-p] [-r] [-z] [-R] [-B] [-M] [-C] [--find-copies-harder] [-O<orderfile>] [-S<string>] [--pickaxe-all] <stage1> <stage2> [<path>...]"; +"git-diff-stages [<common diff options>] <stage1> <stage2> [<path>...]" +COMMON_DIFF_OPTIONS_HELP; static void diff_stages(int stage1, int stage2) { |