diff options
| author | Alexander Potashev <aspotashev@gmail.com> | 2009-01-04 21:39:27 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-05 02:08:49 +0300 |
| commit | 34263de0265a484bf44058819a363bb1e627c0ce (patch) | |
| tree | e33524d34269861730abb1f3386ca90db92d8ab8 /builtin-merge.c | |
| parent | 5c7eee03da32ac8ff5e91159670558b0d7fb9b1a (diff) | |
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 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index e4555b0199..885fad9bba 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -36,8 +36,8 @@ struct strategy { }; static const char * const builtin_merge_usage[] = { - "git-merge [options] <remote>...", - "git-merge [options] <msg> HEAD <remote>", + "git merge [options] <remote>...", + "git merge [options] <msg> HEAD <remote>", NULL }; |