From: Sergey Organov <sorganov@xxxxxxxxx>
"-m <msg>" 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 <sorganov@xxxxxxxxx>
---
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 [<options>] [<commit>...]"),
+ N_("git merge [<options>] [-m <msg>] [<commit>...]"),
N_("git merge [<options>] <msg> HEAD <commit>"),
N_("git merge --abort"),
NULL
--
2.10.0.1.g57b01a3