diff options
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/merge.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 42fff387e..a2105ef90 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -37,8 +37,9 @@ struct strategy { }; static const char * const builtin_merge_usage[] = { - "git merge [options] <remote>...", - "git merge [options] <msg> HEAD <remote>", + "git merge [options] <commit>...", + "git merge [options] <msg> HEAD <commit>", + "git merge --abort", NULL }; |