Merge branch 'dl/no-extern-in-func-decl'

diff --git a/Documentation/git-revert.txt b/Documentation/git-revert.txt
index 6afccb2f1e29fe588c11e979e0d019edc0596b39..0c82ca5bc0e5a380e8fc441fbb34e12c85cffcab 100644 (file)
--- a/Documentation/git-revert.txt
+++ b/Documentation/git-revert.txt
@@ -66,6 +66,13 @@ more details.
        With this option, 'git revert' will not start the commit
        message editor.
 
+--cleanup=<mode>::
+       This option determines how the commit message will be cleaned up before
+       being passed on to the commit machinery. See linkgit:git-commit[1] for more
+       details. In particular, if the '<mode>' is given a value of `scissors`,
+       scissors will be appended to `MERGE_MSG` before being passed on in the case
+       of a conflict.
+
 -n::
 --no-commit::
        Usually the command automatically creates some commits with