From: sorganov@gmail.com Date: Wed, 05 Oct 2016 14:46:19 GMT Subject: [PATCH 1/6] git-merge: clarify "usage" by adding "-m " Message-ID: <773a11751c91c31a05c967ade902b0c8279aab56.1475678515.git.sorganov@gmail.com> In-Reply-To: From: Sergey Organov "-m " is one of essential distinctions between obsolete invocation form and the recent one. Add it to the "usage" returned by 'git merge -h' for more clarity. Signed-off-by: Sergey Organov --- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/merge.c b/builtin/merge.c index a8b57c7..0e367ba 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -43,7 +43,7 @@ struct strategy { }; static const char * const builtin_merge_usage[] = { - N_("git merge [] [...]"), + N_("git merge [] [-m ] [...]"), N_("git merge [] HEAD "), N_("git merge --abort"), NULL -- 2.10.0.1.g57b01a3