Merge branch 'sv/maint-diff-q-clear-fix' into maint

diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 69eb86e4506411b0d8029f849fd4ebff47166d05..c28603ecf58bd065cc8f7c3c4436f1c0f82a7d2e 100644 (file)
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -10,7 +10,7 @@ SYNOPSIS
 [verse]
 'git commit' [-a | --interactive] [-s] [-v] [-u<mode>] [--amend] [--dry-run]
           [(-c | -C) <commit>] [-F <file> | -m <msg>] [--reset-author]
-          [--allow-empty] [--no-verify] [-e] [--author=<author>]
+          [--allow-empty] [--allow-empty-message] [--no-verify] [-e] [--author=<author>]
           [--date=<date>] [--cleanup=<mode>] [--status | --no-status] [--]
           [[-i | -o ]<file>...]
 
@@ -132,6 +132,12 @@ OPTIONS
        from making such a commit.  This option bypasses the safety, and
        is primarily for use by foreign scm interface scripts.
 
+--allow-empty-message::
+       Like --allow-empty this command is primarily for use by foreign
+       scm interface scripts. It allows you to create a commit with an
+       empty commit message without using plumbing commands like
+       linkgit:git-commit-tree[1].
+
 --cleanup=<mode>::
        This option sets how the commit message is cleaned up.
        The  '<mode>' can be one of 'verbatim', 'whitespace', 'strip',