summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
committerJunio C Hamano <gitster@pobox.com>2016-08-10 12:33:18 -0700
commitdb40a622395397c84c247d343ef62acc8775d6b2 (patch)
tree505448d2b765d17ce009e12809315fb07bb457d4 /Documentation
parente6747627865347a534e7106bb1d14e32867b234d (diff)
parent6bc6b6c0dc0a58874a7a6b9afc3156a5cf9bb10d (diff)
downloadgit-db40a622395397c84c247d343ef62acc8775d6b2.tar.gz
Merge branch 'jt/format-patch-from-config'
"git format-patch" learned format.from configuration variable to specify the default settings for its "--from" option. * jt/format-patch-from-config: format-patch: format.from gives the default for --from
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt10
1 files changed, 10 insertions, 0 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index bc1c433c4e..0bcb6790d6 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1253,6 +1253,16 @@ format.attach::
value as the boundary. See the --attach option in
linkgit:git-format-patch[1].
+format.from::
+ Provides the default value for the `--from` option to format-patch.
+ Accepts a boolean value, or a name and email address. If false,
+ format-patch defaults to `--no-from`, using commit authors directly in
+ the "From:" field of patch mails. If true, format-patch defaults to
+ `--from`, using your committer identity in the "From:" field of patch
+ mails and including a "From:" field in the body of the patch mail if
+ different. If set to a non-boolean value, format-patch uses that
+ value instead of your committer identity. Defaults to false.
+
format.numbered::
A boolean which can enable or disable sequence numbers in patch
subjects. It defaults to "auto" which enables it only if there