Skip to content

Commit 3f680f3

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.5.2-215-g77097f
1 parent e1b2683 commit 3f680f3

36 files changed

+94
-94
lines changed

‎config.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1360,7 +1360,7 @@ receive.denyCurrentBranch::
13601360

13611361
receive.denyNonFastForwards::
13621362
If set to true, git-receive-pack will deny a ref update which is
1363-
not a fast forward. Use this to prevent such an update via a push,
1363+
not a fast-forward. Use this to prevent such an update via a push,
13641364
even if that push is forced. This configuration variable is
13651365
set when initializing a shared repository.
13661366

‎git-config.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2765,7 +2765,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
27652765
Controls which merge resolution program is used by
27662766
<a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3",
27672767
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
2768-
"diffuse", "ecmerge", "tortoisemerge", "araxis", and
2768+
"diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
27692769
"opendiff". Any other value is treated is custom merge tool
27702770
and there must be a corresponding mergetool.&lt;tool&gt;.cmd option.
27712771
</p>
@@ -3135,7 +3135,7 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
31353135
<dd>
31363136
<p>
31373137
If set to true, git-receive-pack will deny a ref update which is
3138-
not a fast forward. Use this to prevent such an update via a push,
3138+
not a fast-forward. Use this to prevent such an update via a push,
31393139
even if that push is forced. This configuration variable is
31403140
set when initializing a shared repository.
31413141
</p>
@@ -3563,7 +3563,7 @@ <h2 id="_git">GIT</h2>
35633563
</div>
35643564
<div id="footer">
35653565
<div id="footer-text">
3566-
Last updated 2009-11-15 09:57:02 UTC
3566+
Last updated 2009-11-16 02:10:11 UTC
35673567
</div>
35683568
</div>
35693569
</body>

‎git-difftool.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ <h2 id="_options">OPTIONS</h2>
363363
Use the diff tool specified by &lt;tool&gt;.
364364
Valid merge tools are:
365365
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
366-
ecmerge, diffuse, opendiff and araxis.
366+
ecmerge, diffuse, opendiff, p4merge and araxis.
367367
</p>
368368
<div class="para"><p>If a diff tool is not specified, <em>git-difftool</em>
369369
will use the configuration variable <tt>diff.tool</tt>. If the
@@ -474,7 +474,7 @@ <h2 id="_git">GIT</h2>
474474
</div>
475475
<div id="footer">
476476
<div id="footer-text">
477-
Last updated 2009-11-15 09:57:05 UTC
477+
Last updated 2009-11-16 02:10:11 UTC
478478
</div>
479479
</div>
480480
</body>

‎git-difftool.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ OPTIONS
3131
Use the diff tool specified by <tool>.
3232
Valid merge tools are:
3333
kdiff3, kompare, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff,
34-
ecmerge, diffuse, opendiff and araxis.
34+
ecmerge, diffuse, opendiff, p4merge and araxis.
3535
+
3636
If a diff tool is not specified, 'git-difftool'
3737
will use the configuration variable `diff.tool`. If the

‎git-fetch.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -490,9 +490,9 @@ <h2 id="_options">OPTIONS</h2>
490490
</p>
491491
<div class="para"><p>The remote ref that matches &lt;src&gt;
492492
is fetched, and if &lt;dst&gt; is not empty string, the local
493-
ref that matches it is fast forwarded using &lt;src&gt;.
493+
ref that matches it is fast-forwarded using &lt;src&gt;.
494494
If the optional plus <tt>+</tt> is used, the local ref
495-
is updated even if it does not result in a fast forward
495+
is updated even if it does not result in a fast-forward
496496
update.</p></div>
497497
<div class="admonitionblock">
498498
<table><tr>
@@ -837,7 +837,7 @@ <h2 id="_git">GIT</h2>
837837
</div>
838838
<div id="footer">
839839
<div id="footer-text">
840-
Last updated 2009-11-15 09:57:07 UTC
840+
Last updated 2009-11-16 02:10:11 UTC
841841
</div>
842842
</div>
843843
</body>

‎git-http-push.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,10 +453,10 @@ <h2 id="_specifying_the_refs">Specifying the Refs</h2>
453453
</ul></div>
454454
<div class="para"><p>Without <em>--force</em>, the &lt;src&gt; ref is stored at the remote only if
455455
&lt;dst&gt; does not exist, or &lt;dst&gt; is a proper subset (i.e. an
456-
ancestor) of &lt;src&gt;. This check, known as "fast forward check",
456+
ancestor) of &lt;src&gt;. This check, known as "fast-forward check",
457457
is performed in order to avoid accidentally overwriting the
458458
remote ref and lose other peoples' commits from there.</p></div>
459-
<div class="para"><p>With <em>--force</em>, the fast forward check is disabled for all refs.</p></div>
459+
<div class="para"><p>With <em>--force</em>, the fast-forward check is disabled for all refs.</p></div>
460460
<div class="para"><p>Optionally, a &lt;ref&gt; parameter can be prefixed with a plus <em>+</em> sign
461461
to disable the fast-forward check only on that ref.</p></div>
462462
</div>
@@ -474,7 +474,7 @@ <h2 id="_git">GIT</h2>
474474
</div>
475475
<div id="footer">
476476
<div id="footer-text">
477-
Last updated 2009-11-15 09:57:10 UTC
477+
Last updated 2009-11-16 02:10:11 UTC
478478
</div>
479479
</div>
480480
</body>

‎git-http-push.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ destination side.
8282

8383
Without '--force', the <src> ref is stored at the remote only if
8484
<dst> does not exist, or <dst> is a proper subset (i.e. an
85-
ancestor) of <src>. This check, known as "fast forward check",
85+
ancestor) of <src>. This check, known as "fast-forward check",
8686
is performed in order to avoid accidentally overwriting the
8787
remote ref and lose other peoples' commits from there.
8888

89-
With '--force', the fast forward check is disabled for all refs.
89+
With '--force', the fast-forward check is disabled for all refs.
9090

9191
Optionally, a <ref> parameter can be prefixed with a plus '+' sign
9292
to disable the fast-forward check only on that ref.

‎git-merge.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -624,7 +624,7 @@ <h2 id="_configuration">CONFIGURATION</h2>
624624
Controls which merge resolution program is used by
625625
<a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "kdiff3",
626626
"tkdiff", "meld", "xxdiff", "emerge", "vimdiff", "gvimdiff",
627-
"diffuse", "ecmerge", "tortoisemerge", "araxis", and
627+
"diffuse", "ecmerge", "tortoisemerge", "p4merge", "araxis" and
628628
"opendiff". Any other value is treated is custom merge tool
629629
and there must be a corresponding mergetool.&lt;tool&gt;.cmd option.
630630
</p>
@@ -954,7 +954,7 @@ <h2 id="_git">GIT</h2>
954954
</div>
955955
<div id="footer">
956956
<div id="footer-text">
957-
Last updated 2009-11-15 09:57:13 UTC
957+
Last updated 2009-11-16 02:10:12 UTC
958958
</div>
959959
</div>
960960
</body>

‎git-mergetool.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ <h2 id="_options">OPTIONS</h2>
345345
Use the merge resolution program specified by &lt;tool&gt;.
346346
Valid merge tools are:
347347
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
348-
diffuse, tortoisemerge, opendiff and araxis.
348+
diffuse, tortoisemerge, opendiff, p4merge and araxis.
349349
</p>
350350
<div class="para"><p>If a merge resolution program is not specified, <em>git-mergetool</em>
351351
will use the configuration variable <tt>merge.tool</tt>. If the
@@ -414,7 +414,7 @@ <h2 id="_git">GIT</h2>
414414
</div>
415415
<div id="footer">
416416
<div id="footer-text">
417-
Last updated 2009-11-15 09:57:12 UTC
417+
Last updated 2009-11-16 02:10:12 UTC
418418
</div>
419419
</div>
420420
</body>

‎git-mergetool.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ OPTIONS
2727
Use the merge resolution program specified by <tool>.
2828
Valid merge tools are:
2929
kdiff3, tkdiff, meld, xxdiff, emerge, vimdiff, gvimdiff, ecmerge,
30-
diffuse, tortoisemerge, opendiff and araxis.
30+
diffuse, tortoisemerge, opendiff, p4merge and araxis.
3131
+
3232
If a merge resolution program is not specified, 'git-mergetool'
3333
will use the configuration variable `merge.tool`. If the

0 commit comments

Comments
 (0)