summaryrefslogtreecommitdiff
path: root/merge-index.c
diff options
context:
space:
mode:
authorAlexander Potashev <aspotashev@gmail.com>2009-01-04 18:39:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-02-04 23:08:49 (GMT)
commit34263de0265a484bf44058819a363bb1e627c0ce (patch)
treee33524d34269861730abb1f3386ca90db92d8ab8 /merge-index.c
parent5c7eee03da32ac8ff5e91159670558b0d7fb9b1a (diff)
downloadgit-34263de0265a484bf44058819a363bb1e627c0ce.zip
git-34263de0265a484bf44058819a363bb1e627c0ce.tar.gz
git-34263de0265a484bf44058819a363bb1e627c0ce.tar.bz2
Replace deprecated dashed git commands in usage
Signed-off-by: Alexander Potashev <aspotashev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-index.c')
-rw-r--r--merge-index.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/merge-index.c b/merge-index.c
index c00a2b3..aa9cf23 100644
--- a/merge-index.c
+++ b/merge-index.c
@@ -92,7 +92,7 @@ int main(int argc, char **argv)
signal(SIGCHLD, SIG_DFL);
if (argc < 3)
- usage("git-merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
+ usage("git merge-index [-o] [-q] <merge-program> (-a | [--] <filename>*)");
git_extract_argv0_path(argv[0]);