Autogenerated HTML docs for v2.0.0-390-gcb682

1 files changed, 55 insertions, 6 deletions

diff --git a/git-patch-id.html b/git-patch-id.html
index c8c7458a5..43676ce23 100644
--- a/git-patch-id.html
+++ b/git-patch-id.html
@@ -750,7 +750,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> &lt; &lt;patch&gt;</pre>

+<pre class="content"><em>git patch-id</em> [--stable | --unstable] &lt; &lt;patch&gt;</pre>

 <div class="attribution">

 </div></div>

 </div>

@@ -758,10 +758,10 @@ git-patch-id(1) Manual Page
 <div class="sect1">

 <h2 id="_description">DESCRIPTION</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>A "patch ID" is nothing but a SHA-1 of the diff associated with a patch, with

-whitespace and line numbers ignored.  As such, it&#8217;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>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&#8217;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>

 <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

@@ -775,6 +775,55 @@ 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">

+--stable

+</dt>

+<dd>

+<p>

+        Use a "stable" sum of hashes as the patch ID. With this option:

+</p>

+<div class="ulist"><ul>

+<li>

+<p>

+Reordering file diffs that make up a patch does not affect the ID.

+           In particular, two patches produced by comparing the same two trees

+           with two different settings for "-O&lt;orderfile&gt;" result in the same

+           patch ID signature, thereby allowing the computed result to be used

+           as a key to index some meta-information about the change between

+           the two trees;

+</p>

+</li>

+<li>

+<p>

+Result is different from the value produced by git 1.9 and older

+           or produced when an "unstable" hash (see --unstable below) is

+           configured - even when used on a diff output taken without any use

+           of "-O&lt;orderfile&gt;", thereby making existing databases storing such

+           "unstable" or historical patch-ids unusable.

+</p>

+<div class="literalblock">

+<div class="content">

+<pre><tt>This is the default if patchid.stable is set to true.</tt></pre>

+</div></div>

+</li>

+</ul></div>

+</dd>

+<dt class="hdlist1">

+--unstable

+</dt>

+<dd>

+<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.

+</p>

+<div class="literalblock">

+<div class="content">

+<pre><tt>This is the default.</tt></pre>

+</div></div>

+</dd>

+<dt class="hdlist1">

 &lt;patch&gt;

 </dt>

 <dd>

@@ -795,7 +844,7 @@ This can be used to make a mapping from patch ID to commit ID.</p></div>
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2013-08-20 08:40:27 PDT

+Last updated 2014-06-16 14:13:22 PDT

 </div>

 </div>

 </body>