diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-27 11:05:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-27 11:05:05 -0700 |
| commit | 042f2148898f2f73342c586887b252715dd8af8a (patch) | |
| tree | 186d91f728919ef22f36d69ad4f555e3cb5277ff /git-format-patch.html | |
| parent | fedb1b428f68e8626c38f0aef57a8379e58f3241 (diff) | |
| download | git-htmldocs-042f2148898f2f73342c586887b252715dd8af8a.tar.gz | |
Autogenerated HTML docs for v2.9.0-137-gcf4c2
Diffstat (limited to 'git-format-patch.html')
| -rw-r--r-- | git-format-patch.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git-format-patch.html b/git-format-patch.html index f2559ed5c..b51c1f887 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -804,7 +804,7 @@ The names of the output files are printed to standard output, unless the <code>--stdout</code> option is specified.</p></div>
<div class="paragraph"><p>If <code>-o</code> is specified, output files are created in <dir>. Otherwise
they are created in the current working directory. The default path
-can be set with the <em>format.outputDirectory</em> configuration option.
+can be set with the <code>format.outputDirectory</code> configuration option.
The <code>-o</code> option takes precedence over <code>format.outputDirectory</code>.
To store patches in the current working directory even when
<code>format.outputDirectory</code> points elsewhere, use <code>-o .</code>.</p></div>
@@ -1522,9 +1522,9 @@ of a delete/create pair.</p></div> series, where the head is chosen from the cover letter, the
<code>--in-reply-to</code>, and the first patch mail, in this order. <em>deep</em>
threading makes every mail a reply to the previous one.</p></div>
-<div class="paragraph"><p>The default is <code>--no-thread</code>, unless the <em>format.thread</em> configuration
+<div class="paragraph"><p>The default is <code>--no-thread</code>, unless the <code>format.thread</code> configuration
is set. If <code>--thread</code> is specified without a style, it defaults to the
-style specified by <em>format.thread</em> if any, or else <code>shallow</code>.</p></div>
+style specified by <code>format.thread</code> if any, or else <code>shallow</code>.</p></div>
<div class="paragraph"><p>Beware that the default for <em>git send-email</em> is to thread emails
itself. If you want <code>git format-patch</code> to take care of threading, you
will want to ensure that threading is disabled for <code>git send-email</code>.</p></div>
@@ -2191,7 +2191,7 @@ as e-mailable patches: <div id="footnotes"><hr /></div>
<div id="footer">
<div id="footer-text">
-Last updated 2016-05-23 15:52:04 PDT
+Last updated 2016-06-27 11:04:05 PDT
</div>
</div>
</body>
|