From: Jared Hance <jaredhance@xxxxxxxxx>
Date: Thu, 10 Feb 2011 18:52:41 -0500
We used to be very casual in terminology and used <branch>, <ref>,
<remote> and <rev> more or less interchangeably with <commit> when it
is clear from the context. Match the help text given by "git merge -h"
with that of the documentation.
Signed-off-by: Jared Hance <jaredhance@xxxxxxxxx>
Signed-off-by: Junio C Hamano <gitster@xxxxxxxxx>
---
* Jared said <branch> but 57bddb1 (Documentation/git-merge: reword
references to "remote" and "pull", 2010-01-07) updated it to <commit>,
which is both technically more correct and equally understandable, so I
chose to match the documentation. Also --abort was not described as a
different mode.
builtin/merge.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/builtin/merge.c b/builtin/merge.c
index 42fff38..a2105ef 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
};
--
1.7.4.1.433.gcd306
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html