From: Jared Hance <jaredhance@gmail.com>
Date: Thu, 10 Feb 2011 23:52:41 +0000 (-0500)
Subject: merge: match the help text with the documentation
X-Git-Tag: v1.7.5-rc1~17^2~1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c395c25b8642893dd1bb4be1fd124dd12f9b848c;p=git.git

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 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
 };