diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-20 19:49:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-20 19:49:16 -0700 |
| commit | c5bac17ad21c8e79fcca21c366832e75be095322 (patch) | |
| tree | de6864be255ba016d22ddef52cad71f35b334927 /diff-tree.c | |
| parent | 80913d4364c0be4d9b97eabcd2c8acb800c647c1 (diff) | |
| download | git-c5bac17ad21c8e79fcca21c366832e75be095322.tar.gz | |
[PATCH] Usage-string fixes.
Usage string fixes to make maintenance easier (only one instance
of a string to update not multiple copies). I've spotted and
corrected inconsistent usage text in diff-tree while doing this.
Also diff-cache and read-tree usage text have been corrected to
match their up-to-date features. Earlier, neither "--cached"
form of diff-cache nor "-m single-merge" form of read-tree were
described.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-tree.c')
| -rw-r--r-- | diff-tree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/diff-tree.c b/diff-tree.c index 222591936f..0f370927dd 100644 --- a/diff-tree.c +++ b/diff-tree.c @@ -178,6 +178,8 @@ static int diff_tree_sha1(const unsigned char *old, const unsigned char *new, co return retval; } +static char *diff_tree_usage = "diff-tree [-r] [-z] <tree sha1> <tree sha1>"; + int main(int argc, char **argv) { unsigned char old[20], new[20]; @@ -194,10 +196,10 @@ int main(int argc, char **argv) line_termination = '\0'; continue; } - usage("diff-tree [-r] [-z] <tree sha1> <tree sha1>"); + usage(diff_tree_usage); } if (argc != 3 || get_sha1_hex(argv[1], old) || get_sha1_hex(argv[2], new)) - usage("diff-tree <tree sha1> <tree sha1>"); + usage(diff_tree_usage); return diff_tree_sha1(old, new, ""); } |