Merge branch 'yd/doc-merge-annotated-tag' into maint-1.8.1

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 19cbb9098ff53cd7160d18faf9ac2cd2f56dcb1c..210563819190fa3e02eb89f0a24176d344e64fb0 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -109,6 +109,10 @@ OPTIONS
        format. See linkgit:git-status[1] for details. Implies
        `--dry-run`.
 
+--long::
+       When doing a dry-run, give the output in a the long-format.
+       Implies `--dry-run`.
+
 -z::
 --null::
        When showing `short` or `porcelain` status output, terminate
@@ -133,6 +137,8 @@ OPTIONS
 -m <msg>::
 --message=<msg>::
        Use the given <msg> as the commit message.
+       If multiple `-m` options are given, their values are
+       concatenated as separate paragraphs.
 
 -t <file>::
 --template=<file>::