merge: match the help text with the documentation

We used to be very casual in terminology and used <branch>, <ref> and
<rev> more or less interchangeably with <commit>.  Match the help text
given by "git merge -h" with that of the documentation.

Signed-off-by: Jared Hance <jaredhance@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/merge.c b/builtin/merge.c
index 42fff387e69d9b5412e8e776aed3272b78ebe758..a2105ef90cca1991a24b802b688c12b0bd6fb41d 100644 (file)
--- 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
 };