Merge branch 'rs/path-name-safety-cleanup'

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index 9b200b379bbc980f37033c68342a287637750583..f7a069bb9234850568d0870fa92ef25d0e1a19b5 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -239,7 +239,7 @@ keeping them as Git notes allows them to be maintained between versions
 of the patch series (but see the discussion of the `notes.rewrite`
 configuration options in linkgit:git-notes[1] to use this workflow).
 
---[no]-signature=<signature>::
+--[no-]signature=<signature>::
        Add a signature to each message produced. Per RFC 3676 the signature
        is separated from the body by a line with '-- ' on it. If the
        signature option is omitted the signature defaults to the Git version