Skip to content

Commit 1fbbbc1

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.5.4-rc0-67-gf9c5
1 parent e66c6c0 commit 1fbbbc1

10 files changed

Lines changed: 47 additions & 26 deletions

‎config.txt‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -448,6 +448,13 @@ diff.autorefreshindex::
448448
affects only `git diff` Porcelain, and not lower level
449449
`diff` commands, such as `git diff-files`.
450450

451+
diff.external::
452+
If this config variable is set, diff generation is not
453+
performed using the internal diff machinery, but using the
454+
given command. Note: if you want to use an external diff
455+
program only on a subset of your files, you might want to
456+
use gitlink:gitattributes[5] instead.
457+
451458
diff.renameLimit::
452459
The number of files to consider when performing the copy/rename
453460
detection; equivalent to the git diff option '-l'.
@@ -671,6 +678,10 @@ merge.<driver>.recursive::
671678
performing an internal merge between common ancestors.
672679
See gitlink:gitattributes[5] for details.
673680

681+
mergetool.<tool>.path::
682+
Override the path for the given tool. This is useful in case
683+
your tool is not in the PATH.
684+
674685
pack.window::
675686
The size of the window used by gitlink:git-pack-objects[1] when no
676687
window size is given on the command line. Defaults to 10.

‎git-config.html‎

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1349,6 +1349,18 @@ <h3>Variables</h3>
13491349
</p>
13501350
</dd>
13511351
<dt>
1352+
diff.external
1353+
</dt>
1354+
<dd>
1355+
<p>
1356+
If this config variable is set, diff generation is not
1357+
performed using the internal diff machinery, but using the
1358+
given command. Note: if you want to use an external diff
1359+
program only on a subset of your files, you might want to
1360+
use <a href="gitattributes.html">gitattributes(5)</a> instead.
1361+
</p>
1362+
</dd>
1363+
<dt>
13521364
diff.renameLimit
13531365
</dt>
13541366
<dd>
@@ -1768,6 +1780,15 @@ <h3>Variables</h3>
17681780
</p>
17691781
</dd>
17701782
<dt>
1783+
mergetool.&lt;tool&gt;.path
1784+
</dt>
1785+
<dd>
1786+
<p>
1787+
Override the path for the given tool. This is useful in case
1788+
your tool is not in the PATH.
1789+
</p>
1790+
</dd>
1791+
<dt>
17711792
pack.window
17721793
</dt>
17731794
<dd>
@@ -2105,7 +2126,7 @@ <h2>GIT</h2>
21052126
</div>
21062127
<div id="footer">
21072128
<div id="footer-text">
2108-
Last updated 16-Dec-2007 22:13:21 UTC
2129+
Last updated 18-Dec-2007 06:59:36 UTC
21092130
</div>
21102131
</div>
21112132
</body>

‎git-daemon.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ <h2>DESCRIPTION</h2>
294294
pass some directory paths as <em>git-daemon</em> arguments, you can further restrict
295295
the offers to a whitelist comprising of those.</p>
296296
<p>By default, only <tt>upload-pack</tt> service is enabled, which serves
297-
<tt>git-fetch-pack</tt> and <tt>git-peek-remote</tt> clients that are invoked
298-
from <tt>git-fetch</tt>, <tt>git-ls-remote</tt>, and <tt>git-clone</tt>.</p>
297+
<tt>git-fetch-pack</tt> and <tt>git-ls-remote</tt> clients, which are invoked
298+
from <tt>git-fetch</tt>, <tt>git-pull</tt>, and <tt>git-clone</tt>.</p>
299299
<p>This is ideally suited for read-only updates, i.e., pulling from
300300
git repositories.</p>
301301
<p>An <tt>upload-archive</tt> also exists to serve <tt>git-archive</tt>.</p>
@@ -532,7 +532,7 @@ <h2>SERVICES</h2>
532532
</dt>
533533
<dd>
534534
<p>
535-
This serves <tt>git-fetch-pack</tt> and <tt>git-peek-remote</tt>
535+
This serves <tt>git-fetch-pack</tt> and <tt>git-ls-remote</tt>
536536
clients. It is enabled by default, but a repository can
537537
disable it by setting <tt>daemon.uploadpack</tt> configuration
538538
item to <tt>false</tt>.
@@ -676,7 +676,7 @@ <h2>GIT</h2>
676676
</div>
677677
<div id="footer">
678678
<div id="footer-text">
679-
Last updated 14-Nov-2007 12:11:27 UTC
679+
Last updated 18-Dec-2007 06:59:36 UTC
680680
</div>
681681
</div>
682682
</body>

‎git-daemon.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ pass some directory paths as 'git-daemon' arguments, you can further restrict
3131
the offers to a whitelist comprising of those.
3232

3333
By default, only `upload-pack` service is enabled, which serves
34-
`git-fetch-pack` and `git-peek-remote` clients that are invoked
35-
from `git-fetch`, `git-ls-remote`, and `git-clone`.
34+
`git-fetch-pack` and `git-ls-remote` clients, which are invoked
35+
from `git-fetch`, `git-pull`, and `git-clone`.
3636

3737
This is ideally suited for read-only updates, i.e., pulling from
3838
git repositories.
@@ -166,7 +166,7 @@ the per-repository configuration file can be used to enable or
166166
disable them.
167167

168168
upload-pack::
169-
This serves `git-fetch-pack` and `git-peek-remote`
169+
This serves `git-fetch-pack` and `git-ls-remote`
170170
clients. It is enabled by default, but a repository can
171171
disable it by setting `daemon.uploadpack` configuration
172172
item to `false`.

‎git-ls-remote.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ <h2>OPTIONS</h2>
303303
Specify the full path of <a href="git-upload-pack.html">git-upload-pack(1)</a> on the remote
304304
host. This allows listing references from repositories accessed via
305305
SSH and where the SSH daemon does not use the PATH configured by the
306-
user. Also see the <em>--exec</em> option for <a href="git-peek-remote.html">git-peek-remote(1)</a>.
306+
user.
307307
</p>
308308
</dd>
309309
<dt>
@@ -361,7 +361,7 @@ <h2>GIT</h2>
361361
</div>
362362
<div id="footer">
363363
<div id="footer-text">
364-
Last updated 14-Nov-2007 12:11:35 UTC
364+
Last updated 18-Dec-2007 06:59:37 UTC
365365
</div>
366366
</div>
367367
</body>

‎git-ls-remote.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ OPTIONS
3030
Specify the full path of gitlink:git-upload-pack[1] on the remote
3131
host. This allows listing references from repositories accessed via
3232
SSH and where the SSH daemon does not use the PATH configured by the
33-
user. Also see the '--exec' option for gitlink:git-peek-remote[1].
33+
user.
3434

3535
<repository>::
3636
Location of the repository. The shorthand defined in

‎git-peek-remote.html‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -299,14 +299,6 @@ <h2>OPTIONS</h2>
299299
</p>
300300
</dd>
301301
<dt>
302-
--exec=&lt;git-upload-pack&gt;
303-
</dt>
304-
<dd>
305-
<p>
306-
Same --upload-pack=&lt;git-upload-pack&gt;.
307-
</p>
308-
</dd>
309-
<dt>
310302
&lt;host&gt;
311303
</dt>
312304
<dd>
@@ -340,7 +332,7 @@ <h2>GIT</h2>
340332
</div>
341333
<div id="footer">
342334
<div id="footer-text">
343-
Last updated 25-Nov-2007 04:55:50 UTC
335+
Last updated 18-Dec-2007 06:59:38 UTC
344336
</div>
345337
</div>
346338
</body>

‎git-peek-remote.txt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ OPTIONS
2828
shells, but prefer having a lean .bashrc file (they set most of
2929
the things up in .bash_profile).
3030

31-
\--exec=<git-upload-pack>::
32-
Same \--upload-pack=<git-upload-pack>.
33-
3431
<host>::
3532
A remote host that houses the repository. When this
3633
part is specified, 'git-upload-pack' is invoked via

‎git-show-ref.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ <h2>EXAMPLE</h2>
447447
</div>
448448
<h2>SEE ALSO</h2>
449449
<div class="sectionbody">
450-
<p><a href="git-ls-remote.html">git-ls-remote(1)</a>, <a href="git-peek-remote.html">git-peek-remote(1)</a></p>
450+
<p><a href="git-ls-remote.html">git-ls-remote(1)</a></p>
451451
</div>
452452
<h2>AUTHORS</h2>
453453
<div class="sectionbody">
@@ -460,7 +460,7 @@ <h2>GIT</h2>
460460
</div>
461461
<div id="footer">
462462
<div id="footer-text">
463-
Last updated 14-Nov-2007 12:11:49 UTC
463+
Last updated 18-Dec-2007 06:59:38 UTC
464464
</div>
465465
</div>
466466
</body>

‎git-show-ref.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ to get a listing of all tags together with what they dereference.
160160

161161
SEE ALSO
162162
--------
163-
gitlink:git-ls-remote[1], gitlink:git-peek-remote[1]
163+
gitlink:git-ls-remote[1]
164164

165165
AUTHORS
166166
-------

0 commit comments

Comments
 (0)