summaryrefslogtreecommitdiff
path: root/Documentation/git-format-patch.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-01-26 15:40:30 -0800
committerJunio C Hamano <gitster@pobox.com>2016-01-26 15:40:30 -0800
commitb2ed5ae80a1b45ac00c4c891e693ffcde34a9347 (patch)
treec71994f5b195a1c0d6e709e912fdce63b5c47b4e /Documentation/git-format-patch.txt
parentc7dd1c5818111a86deffde1190b57d07efbeed0a (diff)
parentbc6bf2d7641d6c2450b347d5a0b2f954728bf4d9 (diff)
downloadgit-b2ed5ae80a1b45ac00c4c891e693ffcde34a9347.tar.gz
Merge branch 'ak/format-patch-odir-config'
"git format-patch" learned to notice format.outputDirectory configuration variable. This allows "-o <dir>" option to be omitted on the command line if you always use the same directory in your workflow. * ak/format-patch-odir-config: format-patch: introduce format.outputDirectory configuration
Diffstat (limited to 'Documentation/git-format-patch.txt')
-rw-r--r--Documentation/git-format-patch.txt6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index b149e09065..6821441d7d 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -57,7 +57,11 @@ The names of the output files are printed to standard
output, unless the `--stdout` option is specified.
If `-o` is specified, output files are created in <dir>. Otherwise
-they are created in the current working directory.
+they are created in the current working directory. The default path
+can be set with the 'format.outputDirectory' configuration option.
+The `-o` option takes precedence over `format.outputDirectory`.
+To store patches in the current working directory even when
+`format.outputDirectory` points elsewhere, use `-o .`.
By default, the subject of a single patch is "[PATCH] " followed by
the concatenation of lines from the commit message up to the first blank