Merge branch 'ss/user-manual' into maint

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 96b52bde913b3b8a8c430cbafdc26c74ad4493a5..b149e09065a11ecf21f166261d12cfb585f3cc50 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -257,6 +257,10 @@ you can use `--suffix=-patch` to get `0001-description-of-my-change-patch`.
        using this option cannot be applied properly, but they are
        still useful for code review.
 
+--zero-commit::
+  Output an all-zero hash in each patch's From header instead
+  of the hash of the commit.
+
 --root::
        Treat the revision argument as a <revision range>, even if it
        is just a single commit (that would normally be treated as a