Autogenerated HTML docs for v1.6.6.1-383-g5a9f

1 files changed, 14 insertions, 14 deletions

diff --git a/gitdiffcore.html b/gitdiffcore.html
index 966aaa6b3..d169fc385 100644
--- a/gitdiffcore.html
+++ b/gitdiffcore.html
@@ -324,7 +324,7 @@ gitdiffcore(7) Manual Page
 </div>

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

 <div class="sectionbody">

-<div class="para"><p>The diff commands <em>git-diff-index</em>, <em>git-diff-files</em>, and <em>git-diff-tree</em>

+<div class="para"><p>The diff commands <em>git diff-index</em>, <em>git diff-files</em>, and <em>git diff-tree</em>

 can be told to manipulate differences they find in

 unconventional ways before showing <em>diff</em> output.  The manipulation

 is collectively called "diffcore transformation".  This short note

@@ -333,12 +333,12 @@ that is easier to understand than the conventional kind.</p></div>
 </div>

 <h2 id="_the_chain_of_operation">The chain of operation</h2>

 <div class="sectionbody">

-<div class="para"><p>The <em>git-diff-&#42;</em> family works by first comparing two sets of

+<div class="para"><p>The <em>git diff-&#42;</em> family works by first comparing two sets of

 files:</p></div>

 <div class="ilist"><ul>

 <li>

 <p>

-<em>git-diff-index</em> compares contents of a "tree" object and the

+<em>git diff-index</em> compares contents of a "tree" object and the

    working directory (when <em>--cached</em> flag is not used) or a

    "tree" object and the index file (when <em>--cached</em> flag is

    used);

@@ -346,13 +346,13 @@ files:</p></div>
 </li>

 <li>

 <p>

-<em>git-diff-files</em> compares contents of the index file and the

+<em>git diff-files</em> compares contents of the index file and the

    working directory;

 </p>

 </li>

 <li>

 <p>

-<em>git-diff-tree</em> compares contents of two "tree" objects;

+<em>git diff-tree</em> compares contents of two "tree" objects;

 </p>

 </li>

 </ul></div>

@@ -410,18 +410,18 @@ diffcore-order
 </p>

 </li>

 </ul></div>

-<div class="para"><p>These are applied in sequence.  The set of filepairs <em>git-diff-&#42;</em>

+<div class="para"><p>These are applied in sequence.  The set of filepairs <em>git diff-&#42;</em>

 commands find are used as the input to diffcore-break, and

 the output from diffcore-break is used as the input to the

 next transformation.  The final result is then passed to the

 output routine and generates either diff-raw format (see Output

-format sections of the manual for <em>git-diff-&#42;</em> commands) or

+format sections of the manual for <em>git diff-&#42;</em> commands) or

 diff-patch format.</p></div>

 </div>

 <h2 id="_diffcore_break_for_splitting_up_complete_rewrites">diffcore-break: For Splitting Up "Complete Rewrites"</h2>

 <div class="sectionbody">

 <div class="para"><p>The second transformation in the chain is diffcore-break, and is

-controlled by the -B option to the <em>git-diff-&#42;</em> commands.  This is

+controlled by the -B option to the <em>git diff-&#42;</em> commands.  This is

 used to detect a filepair that represents "complete rewrite" and

 break such filepair into two filepairs that represent delete and

 create.  E.g.  If the input contained this filepair:</p></div>

@@ -453,7 +453,7 @@ after "-B" option (e.g. "-B75" to tell it to use 75%).</p></div>
 <div class="sectionbody">

 <div class="para"><p>This transformation is used to detect renames and copies, and is

 controlled by the -M option (to detect renames) and the -C option

-(to detect copies as well) to the <em>git-diff-&#42;</em> commands.  If the

+(to detect copies as well) to the <em>git diff-&#42;</em> commands.  If the

 input contained these filepairs:</p></div>

 <div class="listingblock">

 <div class="content">

@@ -493,11 +493,11 @@ a similarity score different from the default of 50% by giving a
 number after the "-M" or "-C" option (e.g. "-M8" to tell it to use

 8/10 = 80%).</p></div>

 <div class="para"><p>Note.  When the "-C" option is used with <tt>--find-copies-harder</tt>

-option, <em>git-diff-&#42;</em> commands feed unmodified filepairs to

+option, <em>git diff-&#42;</em> commands feed unmodified filepairs to

 diffcore mechanism as well as modified ones.  This lets the copy

 detector consider unmodified files as copy source candidates at

 the expense of making it slower.  Without <tt>--find-copies-harder</tt>,

-<em>git-diff-&#42;</em> commands can detect copies only if the file that was

+<em>git diff-&#42;</em> commands can detect copies only if the file that was

 copied happened to have been modified in the same changeset.</p></div>

 </div>

 <h2 id="_diffcore_merge_broken_for_putting_complete_rewrites_back_together">diffcore-merge-broken: For Putting "Complete Rewrites" Back Together</h2>

@@ -549,7 +549,7 @@ version prefixed with <em>+</em>.</p></div>
 <div class="sectionbody">

 <div class="para"><p>This transformation is used to find filepairs that represent

 changes that touch a specified string, and is controlled by the

--S option and the <tt>--pickaxe-all</tt> option to the <em>git-diff-&#42;</em>

+-S option and the <tt>--pickaxe-all</tt> option to the <em>git diff-&#42;</em>

 commands.</p></div>

 <div class="para"><p>When diffcore-pickaxe is in use, it checks if there are

 filepairs whose "original" side has the specified string and

@@ -568,7 +568,7 @@ changeset easier.</p></div>
 <div class="sectionbody">

 <div class="para"><p>This is used to reorder the filepairs according to the user's

 (or project's) taste, and is controlled by the -O option to the

-<em>git-diff-&#42;</em> commands.</p></div>

+<em>git diff-&#42;</em> commands.</p></div>

 <div class="para"><p>This takes a text file each of whose lines is a shell glob

 pattern.  Filepairs that match a glob pattern on an earlier line

 in the file are output before ones that match a later line, and

@@ -602,7 +602,7 @@ t</tt></pre>
 </div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2009-12-03 09:12:56 UTC

+Last updated 2010-01-21 17:44:43 UTC

 </div>

 </div>

 </body>