From: Junio C Hamano Date: Thu, 24 Mar 2011 07:35:27 GMT Subject: [PATCH 1/2] merge: match the help text with the documentation Message-ID: <7vlj05as3k.fsf_-_@alter.siamese.dyndns.org> In-Reply-To: <7vpqphasbr.fsf@alter.siamese.dyndns.org> From: Jared Hance Date: Thu, 10 Feb 2011 18:52:41 -0500 We used to be very casual in terminology and used , , and more or less interchangeably with 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 Signed-off-by: Junio C Hamano --- * Jared said but 57bddb1 (Documentation/git-merge: reword references to "remote" and "pull", 2010-01-07) updated it to , 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] ...", - "git merge [options] HEAD ", + "git merge [options] ...", + "git merge [options] HEAD ", + "git merge --abort", NULL }; -- 1.7.4.1.433.gcd306