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

diff --combined Documentation/config.txt
index 0f710ca3c2fcdfa552c15d346af6995b599b0af4,e92a0ee19a3160cf86b2d4f198616d9437a47cbe..877cbc875ec38ef7dca9f3e2a2c860ea9a2f1790
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -870,8 -870,6 +870,8 @@@ When preserve, also pass `--preserve-me
  so that locally committed merge commits will not be flattened
  by running 'git pull'.
  +
 +When the value is `interactive`, the rebase is run in interactive mode.
 ++
  *NOTE*: this is a possibly dangerous operation; do *not* use
  it unless you understand the implications (see linkgit:git-rebase[1]
  for details).
@@@ -1245,6 -1243,10 +1245,10 @@@ format.coverLetter:
        format-patch is invoked, but in addition can be set to "auto", to
        generate a cover-letter only when there's more than one patch.
  
+ format.outputDirectory::
+       Set a custom directory to store the resulting files instead of the
+       current working directory.
+ 
  filter.<driver>.clean::
        The command which is used to convert the content of a worktree
        file to a blob upon checkin.  See linkgit:gitattributes[5] for
@@@ -1452,14 -1454,6 +1456,14 @@@ grep.extendedRegexp:
        option is ignored when the 'grep.patternType' option is set to a value
        other than 'default'.
  
 +grep.threads::
 +      Number of grep worker threads to use.
 +      See `grep.threads` in linkgit:git-grep[1] for more information.
 +
 +grep.fallbackToNoIndex::
 +      If set to true, fall back to git grep --no-index if git grep
 +      is executed outside of a git repository.  Defaults to false.
 +
  gpg.program::
        Use this custom program instead of "gpg" found on $PATH when
        making or verifying a PGP signature. The program must support the
@@@ -2159,8 -2153,6 +2163,8 @@@ When preserve, also pass `--preserve-me
  so that locally committed merge commits will not be flattened
  by running 'git pull'.
  +
 +When the value is `interactive`, the rebase is run in interactive mode.
 ++
  *NOTE*: this is a possibly dangerous operation; do *not* use
  it unless you understand the implications (see linkgit:git-rebase[1]
  for details).

diff --combined Documentation/git-format-patch.txt
index b149e09065a11ecf21f166261d12cfb585f3cc50,64c28031ec9c6a39ce897ccfd3fa48b30f4aa2e4..6821441d7d7beedac1f5b322248c3012d23bb103
--- 1/Documentation/git-format-patch.txt
--- 2/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@@ -57,7 -57,11 +57,11 @@@ The names of the output files are print
  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
@@@ -109,7 -113,6 +113,7 @@@ include::diff-options.txt[
  --signoff::
        Add `Signed-off-by:` line to the commit message, using
        the committer identity of yourself.
 +      See the signoff option in linkgit:git-commit[1] for more information.
  
  --stdout::
        Print all commits to the standard output in mbox format,