summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-16 12:18:38 -0700
committerJunio C Hamano <gitster@pobox.com>2014-06-16 12:18:38 -0700
commitf18871dcd487bd9391accaffb4e818d58f2d2720 (patch)
treeaf26a17cd6f080a2fd4fb427df674f2f330adceb /Documentation/config.txt
parent2075a0c27fa5cf4f9f03964d407dc015c1749a7e (diff)
parent7022650f61ff7d7c9297db4a04f4e93ae14e1750 (diff)
downloadgit-f18871dcd487bd9391accaffb4e818d58f2d2720.tar.gz
Merge branch 'jm/format-patch-mail-sig'
* jm/format-patch-mail-sig: format-patch: add "--signature-file=<file>" option format-patch: make newline after signature conditional
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bdce52981d..20cb3a25bc 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1122,6 +1122,10 @@ format.signature::
Set this variable to the empty string ("") to suppress
signature generation.
+format.signaturefile::
+ Works just like format.signature except the contents of the
+ file specified by this variable will be used as the signature.
+
format.suffix::
The default for format-patch is to output files with the suffix
`.patch`. Use this variable to change that suffix (make sure to