From 1fbbbc15b29bed24f3aba30f91bb26e10dc897f3 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 18 Dec 2007 07:01:27 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.5.4-rc0-67-gf9c5 --- config.txt | 11 +++++++++++ git-config.html | 23 ++++++++++++++++++++++- git-daemon.html | 8 ++++---- git-daemon.txt | 6 +++--- git-ls-remote.html | 4 ++-- git-ls-remote.txt | 2 +- git-peek-remote.html | 10 +--------- git-peek-remote.txt | 3 --- git-show-ref.html | 4 ++-- git-show-ref.txt | 2 +- 10 files changed, 47 insertions(+), 26 deletions(-) diff --git a/config.txt b/config.txt index ce16fc79e..8a0df5736 100644 --- a/config.txt +++ b/config.txt @@ -448,6 +448,13 @@ diff.autorefreshindex:: affects only `git diff` Porcelain, and not lower level `diff` commands, such as `git diff-files`. +diff.external:: + If this config variable is set, diff generation is not + performed using the internal diff machinery, but using the + given command. Note: if you want to use an external diff + program only on a subset of your files, you might want to + use gitlink:gitattributes[5] instead. + diff.renameLimit:: The number of files to consider when performing the copy/rename detection; equivalent to the git diff option '-l'. @@ -671,6 +678,10 @@ merge..recursive:: performing an internal merge between common ancestors. See gitlink:gitattributes[5] for details. +mergetool..path:: + Override the path for the given tool. This is useful in case + your tool is not in the PATH. + pack.window:: The size of the window used by gitlink:git-pack-objects[1] when no window size is given on the command line. Defaults to 10. diff --git a/git-config.html b/git-config.html index f7c9cf8af..e0d81feea 100644 --- a/git-config.html +++ b/git-config.html @@ -1349,6 +1349,18 @@ diff.autorefreshindex

+diff.external +
+
+

+ If this config variable is set, diff generation is not + performed using the internal diff machinery, but using the + given command. Note: if you want to use an external diff + program only on a subset of your files, you might want to + use gitattributes(5) instead. +

+
+
diff.renameLimit
@@ -1768,6 +1780,15 @@ merge.<driver>.recursive

+mergetool.<tool>.path +
+
+

+ Override the path for the given tool. This is useful in case + your tool is not in the PATH. +

+
+
pack.window
@@ -2105,7 +2126,7 @@ transfer.unpackLimit diff --git a/git-daemon.html b/git-daemon.html index fb794a45a..0df3b32ec 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -294,8 +294,8 @@ for export this way (unless the --export-all parameter is specified). I pass some directory paths as git-daemon arguments, you can further restrict the offers to a whitelist comprising of those.

By default, only upload-pack service is enabled, which serves -git-fetch-pack and git-peek-remote clients that are invoked -from git-fetch, git-ls-remote, and git-clone.

+git-fetch-pack and git-ls-remote clients, which are invoked +from git-fetch, git-pull, and git-clone.

This is ideally suited for read-only updates, i.e., pulling from git repositories.

An upload-archive also exists to serve git-archive.

@@ -532,7 +532,7 @@ upload-pack

- This serves git-fetch-pack and git-peek-remote + This serves git-fetch-pack and git-ls-remote clients. It is enabled by default, but a repository can disable it by setting daemon.uploadpack configuration item to false. @@ -676,7 +676,7 @@ selectively enable/disable services per repository

diff --git a/git-daemon.txt b/git-daemon.txt index 99e47c9c2..f1e48dd02 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -31,8 +31,8 @@ pass some directory paths as 'git-daemon' arguments, you can further restrict the offers to a whitelist comprising of those. By default, only `upload-pack` service is enabled, which serves -`git-fetch-pack` and `git-peek-remote` clients that are invoked -from `git-fetch`, `git-ls-remote`, and `git-clone`. +`git-fetch-pack` and `git-ls-remote` clients, which are invoked +from `git-fetch`, `git-pull`, and `git-clone`. This is ideally suited for read-only updates, i.e., pulling from git repositories. @@ -166,7 +166,7 @@ the per-repository configuration file can be used to enable or disable them. upload-pack:: - This serves `git-fetch-pack` and `git-peek-remote` + This serves `git-fetch-pack` and `git-ls-remote` clients. It is enabled by default, but a repository can disable it by setting `daemon.uploadpack` configuration item to `false`. diff --git a/git-ls-remote.html b/git-ls-remote.html index c2ae087e1..cb38a90a4 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html @@ -303,7 +303,7 @@ commit IDs.

Specify the full path of git-upload-pack(1) on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the - user. Also see the --exec option for git-peek-remote(1). + user.

@@ -361,7 +361,7 @@ c5db5456ae3b0873fc659c19fafdde22313cc441 refs/tags/v0.99.2 diff --git a/git-ls-remote.txt b/git-ls-remote.txt index 93e9a6033..445bedaa9 100644 --- a/git-ls-remote.txt +++ b/git-ls-remote.txt @@ -30,7 +30,7 @@ OPTIONS Specify the full path of gitlink:git-upload-pack[1] on the remote host. This allows listing references from repositories accessed via SSH and where the SSH daemon does not use the PATH configured by the - user. Also see the '--exec' option for gitlink:git-peek-remote[1]. + user. :: Location of the repository. The shorthand defined in diff --git a/git-peek-remote.html b/git-peek-remote.html index 740a2585c..669b971e6 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html @@ -299,14 +299,6 @@ git-peek-remote(1) Manual Page

---exec=<git-upload-pack> -
-
-

- Same --upload-pack=<git-upload-pack>. -

-
-
<host>
@@ -340,7 +332,7 @@ git-peek-remote(1) Manual Page diff --git a/git-peek-remote.txt b/git-peek-remote.txt index 38a5325af..09b005b10 100644 --- a/git-peek-remote.txt +++ b/git-peek-remote.txt @@ -28,9 +28,6 @@ OPTIONS shells, but prefer having a lean .bashrc file (they set most of the things up in .bash_profile). -\--exec=:: - Same \--upload-pack=. - :: A remote host that houses the repository. When this part is specified, 'git-upload-pack' is invoked via diff --git a/git-show-ref.html b/git-show-ref.html index aea2f92cc..6100f6ce7 100644 --- a/git-show-ref.html +++ b/git-show-ref.html @@ -447,7 +447,7 @@ flag, so you can do

SEE ALSO

-

git-ls-remote(1), git-peek-remote(1)

+

git-ls-remote(1)

AUTHORS

@@ -460,7 +460,7 @@ Man page by Jonas Fonseca <fonseca@diku.dk>.

diff --git a/git-show-ref.txt b/git-show-ref.txt index 2355aa5e8..7893a5088 100644 --- a/git-show-ref.txt +++ b/git-show-ref.txt @@ -160,7 +160,7 @@ to get a listing of all tags together with what they dereference. SEE ALSO -------- -gitlink:git-ls-remote[1], gitlink:git-peek-remote[1] +gitlink:git-ls-remote[1] AUTHORS ------- -- 2.26.2