summaryrefslogtreecommitdiff
path: root/diff-stages.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2005-07-13 12:52:35 -0700
committerLibravatar Linus Torvalds <torvalds@g5.osdl.org>2005-07-13 13:09:17 -0700
commitdda2d79af2d2858b37bab7f6e088d0730c0959d1 (patch)
tree0252e50a800caa678f835ee26193e5f728459f0a /diff-stages.c
parent[PATCH] git-diff-*: --name-only and --name-only-z. (diff)
downloadtgif-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-stages.c')
-rw-r--r--diff-stages.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/diff-stages.c b/diff-stages.c
index 9d33535fe0..8d86d74179 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)
{