diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-09-17 15:45:52 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-09-17 15:45:52 -0700 |
commit | 980e61ec567f55c9247391052477e61a32d24548 (patch) | |
tree | 6fe236d0a6fd3ffa6a1be9a52219ed50b7dfcd19 /git-format-patch.html | |
parent | a68ff6db4d42f41cb49143a5423fbe50f539043e (diff) | |
download | git-htmldocs-980e61ec567f55c9247391052477e61a32d24548.tar.gz |
Autogenerated HTML docs for v2.19.0-216-g2d3b1c
Diffstat (limited to 'git-format-patch.html')
-rw-r--r-- | git-format-patch.html | 46 |
1 files changed, 45 insertions, 1 deletions
diff --git a/git-format-patch.html b/git-format-patch.html index f38964af0..0a52f9446 100644 --- a/git-format-patch.html +++ b/git-format-patch.html @@ -763,6 +763,8 @@ git-format-patch(1) Manual Page [(--reroll-count|-v) <n>]
[--to=<email>] [--cc=<email>]
[--[no-]cover-letter] [--quiet] [--notes[=<ref>]]
+ [--interdiff=<previous>]
+ [--range-diff=<previous> [--creation-factor=<percent>]]
[--progress]
[<common diff options>]
[ <since> | <revision range> ]</pre>
@@ -1757,6 +1759,48 @@ feeding the result to <code>git send-email</code>.</p></div> </p>
</dd>
<dt class="hdlist1">
+--interdiff=<previous>
+</dt>
+<dd>
+<p>
+ As a reviewer aid, insert an interdiff into the cover letter,
+ or as commentary of the lone patch of a 1-patch series, showing
+ the differences between the previous version of the patch series and
+ the series currently being formatted. <code>previous</code> is a single revision
+ naming the tip of the previous series which shares a common base with
+ the series being formatted (for example <code>git format-patch
+ --cover-letter --interdiff=feature/v1 -3 feature/v2</code>).
+</p>
+</dd>
+<dt class="hdlist1">
+--range-diff=<previous>
+</dt>
+<dd>
+<p>
+ As a reviewer aid, insert a range-diff (see <a href="git-range-diff.html">git-range-diff(1)</a>)
+ into the cover letter, or as commentary of the lone patch of a
+ 1-patch series, showing the differences between the previous
+ version of the patch series and the series currently being formatted.
+ <code>previous</code> can be a single revision naming the tip of the previous
+ series if it shares a common base with the series being formatted (for
+ example <code>git format-patch --cover-letter --range-diff=feature/v1 -3
+ feature/v2</code>), or a revision range if the two versions of the series are
+ disjoint (for example <code>git format-patch --cover-letter
+ --range-diff=feature/v1~3..feature/v1 -3 feature/v2</code>).
+</p>
+</dd>
+<dt class="hdlist1">
+--creation-factor=<percent>
+</dt>
+<dd>
+<p>
+ Used with <code>--range-diff</code>, tweak the heuristic which matches up commits
+ between the previous and current series of patches by adjusting the
+ creation/deletion cost fudge factor. See <a href="git-range-diff.html">git-range-diff(1)</a>)
+ for details.
+</p>
+</dd>
+<dt class="hdlist1">
--notes[=<ref>]
</dt>
<dd>
@@ -2312,7 +2356,7 @@ as e-mailable patches: <div id="footer">
<div id="footer-text">
Last updated
- 2018-05-08 00:51:20 PDT
+ 2018-09-17 15:45:24 PDT
</div>
</div>
</body>
|