[PATCH] fix usage string for renamed git commands

Signed-off-by: Nicolas Pitre <nico@cam.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/diff-files.c b/diff-files.c
index fdd7dd4b0cc8c92a18ddaf0bcf8c9675fcab303b..0cf2c244100e4266c00eddf430a28ed2d859fa4a 100644 (file)
--- a/diff-files.c
+++ b/diff-files.c
@@ -6,8 +6,8 @@
 #include "cache.h"
 #include "diff.h"
 
 #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';
 
 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
                else if (!strcmp(argv[1], "-z"))
                        line_termination = 0;
                else

-                       usage(show_diff_usage);
+                       usage(diff_files_usage);

                argv++; argc--;
        }
 
                argv++; argc--;
        }
 

diff --git a/ls-files.c b/ls-files.c
index c63c7aa4b79d9c00c331068c6390058f8795e346..8b53f2fd52fb3ff30393dac7d00707e76ad96aa4 100644 (file)
--- 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)
        "[ --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
                } 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) {
        }
 
        if (show_ignored && !nr_excludes) {