Skip to content

Commit 22bcc11

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.1-284-g5dc13
1 parent cc0cb31 commit 22bcc11

11 files changed

Lines changed: 43 additions & 10 deletions

‎diff-options.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ endif::git-format-patch[]
3636
--patch-with-raw::
3737
Synonym for "-p --raw".
3838

39+
--patience:
40+
Generate a diff using the "patience diff" algorithm.
41+
3942
--stat[=width[,name-width]]::
4043
Generate a diffstat. You can override the default
4144
output width for 80-column terminal by "--stat=width".

‎git-am.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ <h2>SYNOPSIS</h2>
324324
<div class="content"><em>git am</em> [--signoff] [--keep] [--utf8 | --no-utf8]
325325
[--3way] [--interactive]
326326
[--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]
327+
[--reject]
327328
[&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]
328329
<em>git am</em> (--skip | --resolved | --abort)</div></div>
329330
</div>
@@ -421,6 +422,9 @@ <h2 id="_options">OPTIONS</h2>
421422
<dt>
422423
--directory=&lt;dir&gt;
423424
</dt>
425+
<dt>
426+
--reject
427+
</dt>
424428
<dd>
425429
<p>
426430
These flags are passed to the <em>git-apply</em> (see <a href="git-apply.html">git-apply(1)</a>)
@@ -569,7 +573,7 @@ <h2 id="_git">GIT</h2>
569573
</div>
570574
<div id="footer">
571575
<div id="footer-text">
572-
Last updated 2009-01-22 03:38:31 UTC
576+
Last updated 2009-01-24 08:04:57 UTC
573577
</div>
574578
</div>
575579
</body>

‎git-am.txt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SYNOPSIS
1212
'git am' [--signoff] [--keep] [--utf8 | --no-utf8]
1313
[--3way] [--interactive]
1414
[--whitespace=<option>] [-C<n>] [-p<n>] [--directory=<dir>]
15+
[--reject]
1516
[<mbox> | <Maildir>...]
1617
'git am' (--skip | --resolved | --abort)
1718

@@ -63,6 +64,7 @@ default. You could use `--no-utf8` to override this.
6364
-C<n>::
6465
-p<n>::
6566
--directory=<dir>::
67+
--reject::
6668
These flags are passed to the 'git-apply' (see linkgit:git-apply[1])
6769
program that applies
6870
the patch.

‎git-describe.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ <h2 id="_options">OPTIONS</h2>
379379
</dt>
380380
<dd>
381381
<p>
382-
Instead of using the default 8 hexadecimal digits as the
382+
Instead of using the default 7 hexadecimal digits as the
383383
abbreviated object name, use &lt;n&gt; digits.
384384
</p>
385385
</dd>
@@ -523,7 +523,7 @@ <h2 id="_git">GIT</h2>
523523
</div>
524524
<div id="footer">
525525
<div id="footer-text">
526-
Last updated 2009-01-13 16:47:27 UTC
526+
Last updated 2009-01-24 08:04:57 UTC
527527
</div>
528528
</div>
529529
</body>

‎git-describe.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ OPTIONS
4343
Automatically implies --tags.
4444

4545
--abbrev=<n>::
46-
Instead of using the default 8 hexadecimal digits as the
46+
Instead of using the default 7 hexadecimal digits as the
4747
abbreviated object name, use <n> digits.
4848

4949
--candidates=<n>::

‎git-diff-files.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,10 @@ <h2 id="_options">OPTIONS</h2>
373373
Synonym for "-p --raw".
374374
</p>
375375
</dd>
376+
</dl></div>
377+
<div class="para"><p>--patience:
378+
Generate a diff using the "patience diff" algorithm.</p></div>
379+
<div class="vlist"><dl>
376380
<dt>
377381
--stat[=width[,name-width]]
378382
</dt>
@@ -1387,7 +1391,7 @@ <h2 id="_git">GIT</h2>
13871391
</div>
13881392
<div id="footer">
13891393
<div id="footer-text">
1390-
Last updated 2009-01-18 18:26:21 UTC
1394+
Last updated 2009-01-24 08:04:57 UTC
13911395
</div>
13921396
</div>
13931397
</body>

‎git-diff-index.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,10 @@ <h2 id="_options">OPTIONS</h2>
374374
Synonym for "-p --raw".
375375
</p>
376376
</dd>
377+
</dl></div>
378+
<div class="para"><p>--patience:
379+
Generate a diff using the "patience diff" algorithm.</p></div>
380+
<div class="vlist"><dl>
377381
<dt>
378382
--stat[=width[,name-width]]
379383
</dt>
@@ -1465,7 +1469,7 @@ <h2 id="_git">GIT</h2>
14651469
</div>
14661470
<div id="footer">
14671471
<div id="footer-text">
1468-
Last updated 2009-01-13 16:47:27 UTC
1472+
Last updated 2009-01-24 08:04:57 UTC
14691473
</div>
14701474
</div>
14711475
</body>

‎git-diff-tree.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,10 @@ <h2 id="_options">OPTIONS</h2>
376376
Synonym for "-p --raw".
377377
</p>
378378
</dd>
379+
</dl></div>
380+
<div class="para"><p>--patience:
381+
Generate a diff using the "patience diff" algorithm.</p></div>
382+
<div class="vlist"><dl>
379383
<dt>
380384
--stat[=width[,name-width]]
381385
</dt>
@@ -1911,7 +1915,7 @@ <h2 id="_git">GIT</h2>
19111915
</div>
19121916
<div id="footer">
19131917
<div id="footer-text">
1914-
Last updated 2009-01-22 03:38:31 UTC
1918+
Last updated 2009-01-24 08:04:58 UTC
19151919
</div>
19161920
</div>
19171921
</body>

‎git-diff.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,10 @@ <h2 id="_options">OPTIONS</h2>
453453
Synonym for "-p --raw".
454454
</p>
455455
</dd>
456+
</dl></div>
457+
<div class="para"><p>--patience:
458+
Generate a diff using the "patience diff" algorithm.</p></div>
459+
<div class="vlist"><dl>
456460
<dt>
457461
--stat[=width[,name-width]]
458462
</dt>
@@ -1581,7 +1585,7 @@ <h2 id="_git">GIT</h2>
15811585
</div>
15821586
<div id="footer">
15831587
<div id="footer-text">
1584-
Last updated 2009-01-13 16:47:28 UTC
1588+
Last updated 2009-01-24 08:04:58 UTC
15851589
</div>
15861590
</div>
15871591
</body>

‎git-format-patch.html‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,10 @@ <h2 id="_options">OPTIONS</h2>
422422
Synonym for "-p --raw".
423423
</p>
424424
</dd>
425+
</dl></div>
426+
<div class="para"><p>--patience:
427+
Generate a diff using the "patience diff" algorithm.</p></div>
428+
<div class="vlist"><dl>
425429
<dt>
426430
--stat[=width[,name-width]]
427431
</dt>
@@ -1143,7 +1147,7 @@ <h2 id="_git">GIT</h2>
11431147
</div>
11441148
<div id="footer">
11451149
<div id="footer-text">
1146-
Last updated 2009-01-13 16:47:28 UTC
1150+
Last updated 2009-01-24 08:04:59 UTC
11471151
</div>
11481152
</div>
11491153
</body>

0 commit comments

Comments
 (0)