Merge branch 'ss/pull-rebase-preserve'

diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c0fd470da42991404c722f45ee7ac48cd774287b..bb3ea9372f873ee50c3c6fb4092cd95ebbba3312 100644 (file)
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -273,13 +273,13 @@ attachments, and sign off patches with configuration variables.
 ------------
 [format]
        headers = "Organization: git-foo\n"
-       subjectprefix = CHANGE
+       subjectPrefix = CHANGE
        suffix = .txt
        numbered = auto
        to = <email>
        cc = <email>
        attach [ = mime-boundary-string ]
-       signoff = true
+       signOff = true
        coverletter = auto
 ------------