diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-10-27 02:16:18 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-27 02:16:18 -0700 |
| commit | 019298015bb7c826b72f2573047b7221b0921fd3 (patch) | |
| tree | 5e58905d9adbdb421002d3052869615e3963a761 | |
| parent | Make filenames line up in git-status output (diff) | |
| parent | gitweb: Check git base URLs before generating URL from it (diff) | |
| download | tgif-019298015bb7c826b72f2573047b7221b0921fd3.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Check git base URLs before generating URL from it
Documentation: add git in /etc/services.
Documentation: add upload-archive service to git-daemon.
git-cherry: document limit and add diagram
diff-format.txt: Correct information about pathnames quoting in patch format
| -rw-r--r-- | Documentation/diff-format.txt | 6 | ||||
| -rw-r--r-- | Documentation/everyday.txt | 7 | ||||
| -rw-r--r-- | Documentation/git-cherry.txt | 19 | ||||
| -rw-r--r-- | Documentation/git-daemon.txt | 12 | ||||
| -rwxr-xr-x | gitweb/gitweb.perl | 2 |
5 files changed, 41 insertions, 5 deletions
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt index ed4ebcbab7..e4520e28e5 100644 --- a/Documentation/diff-format.txt +++ b/Documentation/diff-format.txt @@ -144,8 +144,10 @@ the file that rename/copy produces, respectively. dissimilarity index <number> index <hash>..<hash> <mode> -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/Documentation/everyday.txt b/Documentation/everyday.txt index 278161f587..9677671892 100644 --- a/Documentation/everyday.txt +++ b/Documentation/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/Documentation/git-cherry.txt b/Documentation/git-cherry.txt index e1bf8ee255..27b67b81a5 100644 --- a/Documentation/git-cherry.txt +++ b/Documentation/git-cherry.txt @@ -7,7 +7,7 @@ git-cherry - Find commits not merged upstream SYNOPSIS -------- -'git-cherry' [-v] <upstream> [<head>] +'git-cherry' [-v] <upstream> [<head>] [<limit>] DESCRIPTION ----------- @@ -18,7 +18,22 @@ Every commit that doesn't exist in the <upstream> branch 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 diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 4b2ea2df31..993adc7c5a 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/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/gitweb/gitweb.perl b/gitweb/gitweb.perl index 5a81b8ffcd..aceaeb7675 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -80,7 +80,7 @@ our $strict_export = "++GITWEB_STRICT_EXPORT++"; # list of git base URLs used for URL to where fetch project from, # i.e. full URL is "$git_base_url/$project" -our @git_base_url_list = ("++GITWEB_BASE_URL++"); +our @git_base_url_list = grep { $_ ne '' } ("++GITWEB_BASE_URL++"); # default blob_plain mimetype and default charset for text/plain blob our $default_blob_plain_mimetype = 'text/plain'; |