From a053d54fabc1d177125a3c62a267ca75f2cda80b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 27 Oct 2006 09:29:13 +0000 Subject: [PATCH] Autogenerated HTML docs for v1.4.3.3-g01929 --- diff-format.txt | 6 ++++-- everyday.html | 12 +++++++++++- everyday.txt | 7 +++++++ git-cherry.html | 22 +++++++++++++++++++--- git-cherry.txt | 19 +++++++++++++++++-- git-daemon.html | 21 ++++++++++++++++++++- git-daemon.txt | 12 ++++++++++++ git-diff-files.html | 8 +++++--- git-diff-index.html | 8 +++++--- git-diff-stages.html | 8 +++++--- git-diff-tree.html | 8 +++++--- 11 files changed, 110 insertions(+), 21 deletions(-) diff --git a/diff-format.txt b/diff-format.txt index ed4ebcbab7..e4520e28e5 100644 --- a/diff-format.txt +++ b/diff-format.txt @@ -144,8 +144,10 @@ the file that rename/copy produces, respectively. dissimilarity index index .. -3. TAB, LF, and backslash characters in pathnames are - represented as `\t`, `\n`, and `\\`, respectively. +3. TAB, LF, double quote and backslash characters in pathnames + are represented as `\t`, `\n`, `\"` and `\\`, respectively. + If there is need for such substitution then the whole + pathname is put in double quotes. combined diff format diff --git a/everyday.html b/everyday.html index e6a7289e1c..265949c85b 100644 --- a/everyday.html +++ b/everyday.html @@ -889,6 +889,16 @@ example of managing a shared central repository.

Examples

+We assume the following in /etc/services +
+
+
+
+
$ grep 9418 /etc/services
+git             9418/tcp                # Git Version Control System
+
+
+
Run git-daemon to serve /pub/scm from inetd.
@@ -1035,7 +1045,7 @@ upload to public HTTP server hosted by your ISP. diff --git a/everyday.txt b/everyday.txt index 278161f587..9677671892 100644 --- a/everyday.txt +++ b/everyday.txt @@ -353,6 +353,13 @@ example of managing a shared central repository. Examples ~~~~~~~~ +We assume the following in /etc/services:: ++ +------------ +$ grep 9418 /etc/services +git 9418/tcp # Git Version Control System +------------ + Run git-daemon to serve /pub/scm from inetd.:: + ------------ diff --git a/git-cherry.html b/git-cherry.html index cec73bfc7b..0bdeaf7a6d 100644 --- a/git-cherry.html +++ b/git-cherry.html @@ -272,7 +272,7 @@ git-cherry(1) Manual Page

SYNOPSIS

-

git-cherry [-v] <upstream> [<head>]

+

git-cherry [-v] <upstream> [<head>] [<limit>]

DESCRIPTION

@@ -282,7 +282,23 @@ is compared against each commit between the fork-point and <upstream>.

has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the <upstream> branch are prefixed with a minus (-) sign, and those -that only exist in the <head> branch are prefixed with a plus (+) symbol.

+that only exist in the <head> branch are prefixed with a plus (+) symbol:

+
+
+
           __*__*__*__*__> <upstream>
+          /
+fork-point
+          \__+__+__-__+__+__-__+__> <head>
+
+

If a <limit> has been given then the commits along the <head> branch up +to and including <limit> are not reported:

+
+
+
           __*__*__*__*__> <upstream>
+          /
+fork-point
+          \__*__*__<limit>__-__+__> <head>
+

Because git-cherry compares the changeset rather than the commit id (sha1), you can use git-cherry to find out if a commit you made locally has been applied <upstream> under a different commit id. For example, @@ -332,7 +348,7 @@ than pushing or pulling commits directly.

diff --git a/git-cherry.txt b/git-cherry.txt index e1bf8ee255..27b67b81a5 100644 --- a/git-cherry.txt +++ b/git-cherry.txt @@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git-cherry' [-v] [] +'git-cherry' [-v] [] [] DESCRIPTION ----------- @@ -18,7 +18,22 @@ Every commit that doesn't exist in the branch has its id (sha1) reported, prefixed by a symbol. The ones that have equivalent change already in the branch are prefixed with a minus (-) sign, and those -that only exist in the branch are prefixed with a plus (+) symbol. +that only exist in the branch are prefixed with a plus (+) symbol: + + __*__*__*__*__> + / + fork-point + \__+__+__-__+__+__-__+__> + + +If a has been given then the commits along the branch up +to and including are not reported: + + __*__*__*__*__> + / + fork-point + \__*__*____-__+__> + Because git-cherry compares the changeset rather than the commit id (sha1), you can use git-cherry to find out if a commit you made locally diff --git a/git-daemon.html b/git-daemon.html index aeb9fe9dab..aae799aade 100644 --- a/git-daemon.html +++ b/git-daemon.html @@ -298,6 +298,7 @@ the offers to a whitelist comprising of those.

from git-fetch, git-ls-remote, 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.

OPTIONS

@@ -519,12 +520,30 @@ upload-pack item to false.

+
+upload-archive +
+
+

+ This serves git-archive --remote. +

+

EXAMPLES

+We assume the following in /etc/services +
+
+
+
+
$ grep 9418 /etc/services
+git             9418/tcp                # Git Version Control System
+
+
+
git-daemon as inetd server
@@ -605,7 +624,7 @@ they correspond to these IP addresses.

diff --git a/git-daemon.txt b/git-daemon.txt index 4b2ea2df31..993adc7c5a 100644 --- a/git-daemon.txt +++ b/git-daemon.txt @@ -37,6 +37,8 @@ from `git-fetch`, `git-ls-remote`, 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`. + OPTIONS ------- --strict-paths:: @@ -155,8 +157,18 @@ upload-pack:: disable it by setting `daemon.uploadpack` configuration item to `false`. +upload-archive:: + This serves `git-archive --remote`. + EXAMPLES -------- +We assume the following in /etc/services:: ++ +------------ +$ grep 9418 /etc/services +git 9418/tcp # Git Version Control System +------------ + git-daemon as inetd server:: To set up `git-daemon` as an inetd service that handles any repository under the whitelisted set of directories, /pub/foo diff --git a/git-diff-files.html b/git-diff-files.html index 3f9d971ecf..e00a44e658 100644 --- a/git-diff-files.html +++ b/git-diff-files.html @@ -865,8 +865,10 @@ index <hash>..<hash> <mode>

  • -TAB, LF, and backslash characters in pathnames are - represented as \t, \n, and \\, respectively. +TAB, LF, double quote and backslash characters in pathnames + are represented as \t, \n, \" and \\, respectively. + If there is need for such substitution then the whole + pathname is put in double quotes.

    • @@ -1007,7 +1009,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-index.html b/git-diff-index.html index f86166f79b..28c5552254 100644 --- a/git-diff-index.html +++ b/git-diff-index.html @@ -861,8 +861,10 @@ index <hash>..<hash> <mode>

  • -TAB, LF, and backslash characters in pathnames are - represented as \t, \n, and \\, respectively. +TAB, LF, double quote and backslash characters in pathnames + are represented as \t, \n, \" and \\, respectively. + If there is need for such substitution then the whole + pathname is put in double quotes.

    • @@ -1097,7 +1099,7 @@ always have the special all-zero sha1. diff --git a/git-diff-stages.html b/git-diff-stages.html index e5d2eb278d..0bf670f850 100644 --- a/git-diff-stages.html +++ b/git-diff-stages.html @@ -839,8 +839,10 @@ index <hash>..<hash> <mode>

  • -TAB, LF, and backslash characters in pathnames are - represented as \t, \n, and \\, respectively. +TAB, LF, double quote and backslash characters in pathnames + are represented as \t, \n, \" and \\, respectively. + If there is need for such substitution then the whole + pathname is put in double quotes.

    • @@ -981,7 +983,7 @@ two unresolved merge parents with the working tree file diff --git a/git-diff-tree.html b/git-diff-tree.html index 5069bafc9a..854dc0ebba 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html @@ -1027,8 +1027,10 @@ index <hash>..<hash> <mode>

  • -TAB, LF, and backslash characters in pathnames are - represented as \t, \n, and \\, respectively. +TAB, LF, double quote and backslash characters in pathnames + are represented as \t, \n, \" and \\, respectively. + If there is need for such substitution then the whole + pathname is put in double quotes.

    • @@ -1169,7 +1171,7 @@ two unresolved merge parents with the working tree file -- 2.34.1