[PATCH] fix usage string for renamed git commands
Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>maint
parent
89967023da
commit
1771039129
|
@ -6,8 +6,8 @@
|
||||||
#include "cache.h"
|
#include "cache.h"
|
||||||
#include "diff.h"
|
#include "diff.h"
|
||||||
|
|
||||||
static const char *show_diff_usage =
|
static const char *diff_files_usage =
|
||||||
"show-diff [-p] [-q] [-r] [-z] [paths...]";
|
"diff-files [-p] [-q] [-r] [-z] [paths...]";
|
||||||
|
|
||||||
static int generate_patch = 0;
|
static int generate_patch = 0;
|
||||||
static int line_termination = '\n';
|
static int line_termination = '\n';
|
||||||
|
@ -80,7 +80,7 @@ int main(int argc, char **argv)
|
||||||
else if (!strcmp(argv[1], "-z"))
|
else if (!strcmp(argv[1], "-z"))
|
||||||
line_termination = 0;
|
line_termination = 0;
|
||||||
else
|
else
|
||||||
usage(show_diff_usage);
|
usage(diff_files_usage);
|
||||||
argv++; argc--;
|
argv++; argc--;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -206,8 +206,8 @@ static void show_files(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *show_files_usage =
|
static const char *ls_files_usage =
|
||||||
"show-files [-z] (--[cached|deleted|others|stage|unmerged])* "
|
"ls-files [-z] (--[cached|deleted|others|stage|unmerged])* "
|
||||||
"[ --ignored [--exclude=<pattern>] [--exclude-from=<file>) ]";
|
"[ --ignored [--exclude=<pattern>] [--exclude-from=<file>) ]";
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
|
@ -242,7 +242,7 @@ int main(int argc, char **argv)
|
||||||
} else if (!strncmp(arg, "--exclude-from=", 15)) {
|
} else if (!strncmp(arg, "--exclude-from=", 15)) {
|
||||||
add_excludes_from_file(arg+15);
|
add_excludes_from_file(arg+15);
|
||||||
} else
|
} else
|
||||||
usage(show_files_usage);
|
usage(ls_files_usage);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (show_ignored && !nr_excludes) {
|
if (show_ignored && !nr_excludes) {
|
||||||
|
|
Loading…
Reference in New Issue