diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-26 01:18:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-26 01:18:55 -0700 |
| commit | e893f7ad73d387afc582d7eb063d57a88be4663d (patch) | |
| tree | 925a8741e75c176f42e843bd8c30affa9d00da09 /Documentation/git-daemon.txt | |
| parent | eb153837d8509fc6ef59b17630429c63c0993b2d (diff) | |
| parent | d5f6a01af0658bc0ec5f068d81ba321be94526d5 (diff) | |
| download | git-e893f7ad73d387afc582d7eb063d57a88be4663d.tar.xz | |
Merge branch 'jc/combined'
* jc/combined:
combine-diff: a few more finishing touches.
Documentation: clarify refname disambiguation rules.
diff-format.txt: Combined diff format documentation supplement
Remove --syslog in git-daemon inetd documentation examples.
Documentation: updates to "Everyday GIT"
Diffstat (limited to 'Documentation/git-daemon.txt')
| -rw-r--r-- | Documentation/git-daemon.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index d562232e52..4b2ea2df31 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -165,8 +165,7 @@ git-daemon as inetd server:: + ------------------------------------------------ git stream tcp nowait nobody /usr/bin/git-daemon - git-daemon --inetd --verbose - --syslog --export-all + git-daemon --inetd --verbose --export-all /pub/foo /pub/bar ------------------------------------------------ @@ -179,8 +178,7 @@ git-daemon as inetd server for virtual hosts:: + ------------------------------------------------ git stream tcp nowait nobody /usr/bin/git-daemon - git-daemon --inetd --verbose - --syslog --export-all + git-daemon --inetd --verbose --export-all --interpolated-path=/pub/%H%D /pub/www.example.org/software /pub/www.example.com/software |