diff options
Diffstat (limited to 'git-patch-id.html')
| -rw-r--r-- | git-patch-id.html | 36 |
1 files changed, 27 insertions, 9 deletions
diff --git a/git-patch-id.html b/git-patch-id.html index bede81485..2ce031a5b 100644 --- a/git-patch-id.html +++ b/git-patch-id.html @@ -749,7 +749,7 @@ git-patch-id(1) Manual Page <h2 id="_synopsis">SYNOPSIS</h2>
<div class="sectionbody">
<div class="verseblock">
-<pre class="content"><em>git patch-id</em> [--stable | --unstable]</pre>
+<pre class="content"><em>git patch-id</em> [--stable | --unstable | --verbatim]</pre>
<div class="attribution">
</div></div>
</div>
@@ -759,10 +759,10 @@ git-patch-id(1) Manual Page <div class="sectionbody">
<div class="paragraph"><p>Read a patch from the standard input and compute the patch ID for it.</p></div>
<div class="paragraph"><p>A "patch ID" is nothing but a sum of SHA-1 of the file diffs associated with a
-patch, with whitespace and line numbers ignored. As such, it’s "reasonably
-stable", but at the same time also reasonably unique, i.e., two patches that
-have the same "patch ID" are almost guaranteed to be the same thing.</p></div>
-<div class="paragraph"><p>IOW, you can use this thing to look for likely duplicate commits.</p></div>
+patch, with line numbers ignored. As such, it’s "reasonably stable", but at
+the same time also reasonably unique, i.e., two patches that have the same
+"patch ID" are almost guaranteed to be the same thing.</p></div>
+<div class="paragraph"><p>The main usecase for this command is to look for likely duplicate commits.</p></div>
<div class="paragraph"><p>When dealing with <em>git diff-tree</em> output, it takes advantage of
the fact that the patch is prefixed with the object name of the
commit, and outputs two 40-byte hexadecimal strings. The first
@@ -775,6 +775,19 @@ This can be used to make a mapping from patch ID to commit ID.</p></div> <div class="sectionbody">
<div class="dlist"><dl>
<dt class="hdlist1">
+--verbatim
+</dt>
+<dd>
+<p>
+ Calculate the patch-id of the input as it is given, do not strip
+ any whitespace.
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><code>This is the default if patchid.verbatim is true.</code></pre>
+</div></div>
+</dd>
+<dt class="hdlist1">
--stable
</dt>
<dd>
@@ -800,6 +813,11 @@ Result is different from the value produced by git 1.9 and older of "-O<orderfile>", thereby making existing databases storing such
"unstable" or historical patch-ids unusable.
</p>
+</li>
+<li>
+<p>
+All whitespace within the patch is ignored and does not affect the id.
+</p>
<div class="literalblock">
<div class="content">
<pre><code>This is the default if patchid.stable is set to true.</code></pre>
@@ -814,9 +832,9 @@ Result is different from the value produced by git 1.9 and older <p>
Use an "unstable" hash as the patch ID. With this option,
the result produced is compatible with the patch-id value produced
- by git 1.9 and older. Users with pre-existing databases storing
- patch-ids produced by git 1.9 and older (who do not deal with reordered
- patches) may want to use this option.
+ by git 1.9 and older and whitespace is ignored. Users with pre-existing
+ databases storing patch-ids produced by git 1.9 and older (who do not deal
+ with reordered patches) may want to use this option.
</p>
<div class="literalblock">
<div class="content">
@@ -837,7 +855,7 @@ Result is different from the value produced by git 1.9 and older <div id="footer">
<div id="footer-text">
Last updated
- 2020-03-10 15:02:33 PDT
+ 2022-11-04 21:49:36 PDT
</div>
</div>
</body>
|