aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2005-04-30 13:59:38 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-30 13:59:38 -0700
commit17710391299af14fc38cdee10cc7cc9d44668329 (patch)
treec5f414e956ce428a6ced97f3cc3ca3a2a5c6f05d
parent89967023da94c0d874713284869e1924797d30bb (diff)
downloadgit-17710391299af14fc38cdee10cc7cc9d44668329.tar.gz
git-17710391299af14fc38cdee10cc7cc9d44668329.tar.xz
[PATCH] fix usage string for renamed git commands
Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--diff-files.c6
-rw-r--r--ls-files.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/diff-files.c b/diff-files.c
index fdd7dd4b0..0cf2c2441 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -6,8 +6,8 @@
#include "cache.h"
#include "diff.h"
-static const char *show_diff_usage =
-"show-diff [-p] [-q] [-r] [-z] [paths...]";
+static const char *diff_files_usage =
+"diff-files [-p] [-q] [-r] [-z] [paths...]";
static int generate_patch = 0;
static int line_termination = '\n';
@@ -80,7 +80,7 @@ int main(int argc, char **argv)
else if (!strcmp(argv[1], "-z"))
line_termination = 0;
else
- usage(show_diff_usage);
+ usage(diff_files_usage);
argv++; argc--;
}
diff --git a/ls-files.c b/ls-files.c
index c63c7aa4b..8b53f2fd5 100644
--- a/ls-files.c
+++ b/ls-files.c
@@ -206,8 +206,8 @@ static void show_files(void)
}
}
-static const char *show_files_usage =
- "show-files [-z] (--[cached|deleted|others|stage|unmerged])* "
+static const char *ls_files_usage =
+ "ls-files [-z] (--[cached|deleted|others|stage|unmerged])* "
"[ --ignored [--exclude=<pattern>] [--exclude-from=<file>) ]";
int main(int argc, char **argv)
@@ -242,7 +242,7 @@ int main(int argc, char **argv)
} else if (!strncmp(arg, "--exclude-from=", 15)) {
add_excludes_from_file(arg+15);
} else
- usage(show_files_usage);
+ usage(ls_files_usage);
}
if (show_ignored && !nr_excludes) {