From: Brandon <brandondong96@gmail.com>
Include mention of --message flag in merge docs to match what is accepted (builtin/merge.c) and to make it consistent with the git commit docs.
Signed-off-by: Brandon Dong <brandondong96@gmail.com>
---
doc: add missing --message long option to merge docsPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-2315%2Fbrandondong%2Fmerge_message_docs-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-2315/brandondong/merge_message_docs-v1 Pull-Request: https://github.com/git/git/pull/2315
Documentation/git-merge.adoc | 1 + 1 file changed, 1 insertion(+)
Show changes to Documentation/git-merge.adoc +1 −0
diff --git a/Documentation/git-merge.adoc b/Documentation/git-merge.adoc index a055384ad6..6581f4c69c 100644 --- a/Documentation/git-merge.adoc +++ b/Documentation/git-merge.adoc @@ -68,6 +68,7 @@ OPTIONS include::merge-options.adoc[] `-m <msg>`:: +`--message=<msg>`:: Set the commit message to be used for the merge commit (in case one is created). + base-commit: c69baaf57ba26cf117c2b6793802877f19738b0d
-- gitgitgadget