Skip to content

Commit a574a09

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.7.1-331-ga5080
1 parent 13002fb commit a574a09

28 files changed

+680
-127
lines changed

‎cmds-mainporcelain.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ linkgit:git-mv[1]::
6868
Move or rename a file, a directory, or a symlink.
6969

7070
linkgit:git-notes[1]::
71-
Add/inspect object notes.
71+
Add or inspect object notes.
7272

7373
linkgit:git-pull[1]::
7474
Fetch from and merge with another repository or a local branch.

‎config.txt‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -520,18 +520,12 @@ check that makes sure that existing object files will not get overwritten.
520520

521521
core.notesRef::
522522
When showing commit messages, also show notes which are stored in
523-
the given ref. This ref is expected to contain files named
524-
after the full SHA-1 of the commit they annotate. The ref
525-
must be fully qualified.
523+
the given ref. The ref must be fully qualified. If the given
524+
ref does not exist, it is not an error but means that no
525+
notes should be printed.
526526
+
527-
If such a file exists in the given ref, the referenced blob is read, and
528-
appended to the commit message, separated by a "Notes (<refname>):"
529-
line (shortened to "Notes:" in the case of "refs/notes/commits"). If the
530-
given ref itself does not exist, it is not an error, but means that no
531-
notes should be printed.
532-
+
533-
This setting defaults to "refs/notes/commits", and can be overridden by
534-
the `GIT_NOTES_REF` environment variable.
527+
This setting defaults to "refs/notes/commits", and it can be overridden by
528+
the 'GIT_NOTES_REF' environment variable. See linkgit:git-notes[1].
535529

536530
core.sparseCheckout::
537531
Enable "sparse checkout" feature. See section "Sparse checkout" in
@@ -1481,6 +1475,16 @@ pager.<cmd>::
14811475
it takes precedence over this option. To disable pagination for
14821476
all commands, set `core.pager` or `GIT_PAGER` to `cat`.
14831477

1478+
pretty.<name>::
1479+
Alias for a --pretty= format string, as specified in
1480+
linkgit:git-log[1]. Any aliases defined here can be used just
1481+
as the built-in pretty formats could. For example,
1482+
running `git config pretty.changelog "format:{asterisk} %H %s"`
1483+
would cause the invocation `git log --pretty=changelog`
1484+
to be equivalent to running `git log "--pretty=format:{asterisk} %H %s"`.
1485+
Note that an alias with the same name as a built-in format
1486+
will be silently ignored.
1487+
14841488
pull.octopus::
14851489
The default merge strategy to use when pulling multiple branches
14861490
at once.

‎diff-options.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,14 @@ endif::git-format-patch[]
210210
Break complete rewrite changes into pairs of delete and create.
211211

212212
-M::
213+
ifndef::git-log[]
213214
Detect renames.
215+
endif::git-log[]
216+
ifdef::git-log[]
217+
If generating diffs, detect and report renames for each commit.
218+
For following files across renames while traversing history, see
219+
`--follow`.
220+
endif::git-log[]
214221

215222
-C::
216223
Detect copies as well as renames. See also `--find-copies-harder`.

‎git-add.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,9 @@ <h2 id="_interactive_mode">Interactive mode</h2>
671671
<div class="content">
672672
<pre><tt>y - stage this hunk
673673
n - do not stage this hunk
674-
q - quit, do not stage this hunk nor any of the remaining ones
675-
a - stage this and all the remaining hunks in the file
676-
d - do not stage this hunk nor any of the remaining hunks in the file
674+
q - quit; do not stage this hunk nor any of the remaining ones
675+
a - stage this hunk and all later hunks in the file
676+
d - do not stage this hunk nor any of the later hunks in the file
677677
g - select a hunk to go to
678678
/ - search for a hunk matching the given regex
679679
j - leave this hunk undecided, see next undecided hunk
@@ -721,7 +721,7 @@ <h2 id="_git">GIT</h2>
721721
</div>
722722
<div id="footer">
723723
<div id="footer-text">
724-
Last updated 2010-04-24 02:55:46 UTC
724+
Last updated 2010-06-13 19:56:31 UTC
725725
</div>
726726
</div>
727727
</body>

‎git-add.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,9 +266,9 @@ patch::
266266

267267
y - stage this hunk
268268
n - do not stage this hunk
269-
q - quit, do not stage this hunk nor any of the remaining ones
270-
a - stage this and all the remaining hunks in the file
271-
d - do not stage this hunk nor any of the remaining hunks in the file
269+
q - quit; do not stage this hunk nor any of the remaining ones
270+
a - stage this hunk and all later hunks in the file
271+
d - do not stage this hunk nor any of the later hunks in the file
272272
g - select a hunk to go to
273273
/ - search for a hunk matching the given regex
274274
j - leave this hunk undecided, see next undecided hunk

‎git-config.html‎

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1493,17 +1493,12 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
14931493
<dd>
14941494
<p>
14951495
When showing commit messages, also show notes which are stored in
1496-
the given ref. This ref is expected to contain files named
1497-
after the full SHA-1 of the commit they annotate. The ref
1498-
must be fully qualified.
1496+
the given ref. The ref must be fully qualified. If the given
1497+
ref does not exist, it is not an error but means that no
1498+
notes should be printed.
14991499
</p>
1500-
<div class="para"><p>If such a file exists in the given ref, the referenced blob is read, and
1501-
appended to the commit message, separated by a "Notes (&lt;refname&gt;):"
1502-
line (shortened to "Notes:" in the case of "refs/notes/commits"). If the
1503-
given ref itself does not exist, it is not an error, but means that no
1504-
notes should be printed.</p></div>
1505-
<div class="para"><p>This setting defaults to "refs/notes/commits", and can be overridden by
1506-
the <tt>GIT_NOTES_REF</tt> environment variable.</p></div>
1500+
<div class="para"><p>This setting defaults to "refs/notes/commits", and it can be overridden by
1501+
the <em>GIT_NOTES_REF</em> environment variable. See <a href="git-notes.html">git-notes(1)</a>.</p></div>
15071502
</dd>
15081503
<dt>
15091504
core.sparseCheckout
@@ -3326,6 +3321,21 @@ <h3 id="_variables">Variables</h3><div style="clear:left"></div>
33263321
</p>
33273322
</dd>
33283323
<dt>
3324+
pretty.&lt;name&gt;
3325+
</dt>
3326+
<dd>
3327+
<p>
3328+
Alias for a --pretty= format string, as specified in
3329+
<a href="git-log.html">git-log(1)</a>. Any aliases defined here can be used just
3330+
as the built-in pretty formats could. For example,
3331+
running <tt>git config pretty.changelog "format:&#42; %H %s"</tt>
3332+
would cause the invocation <tt>git log --pretty=changelog</tt>
3333+
to be equivalent to running <tt>git log "--pretty=format:&#42; %H %s"</tt>.
3334+
Note that an alias with the same name as a built-in format
3335+
will be silently ignored.
3336+
</p>
3337+
</dd>
3338+
<dt>
33293339
pull.octopus
33303340
</dt>
33313341
<dd>
@@ -3916,7 +3926,7 @@ <h2 id="_git">GIT</h2>
39163926
</div>
39173927
<div id="footer">
39183928
<div id="footer-text">
3919-
Last updated 2010-06-01 05:05:55 UTC
3929+
Last updated 2010-06-13 19:56:31 UTC
39203930
</div>
39213931
</div>
39223932
</body>

‎git-cvsserver.html‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -411,8 +411,6 @@ <h2 id="_description">DESCRIPTION</h2>
411411
</div>
412412
<h2 id="_limitations">LIMITATIONS</h2>
413413
<div class="sectionbody">
414-
<div class="para"><p>Currently cvsserver works over SSH connections for read/write clients, and
415-
over pserver for anonymous CVS access.</p></div>
416414
<div class="para"><p>CVS clients cannot tag, branch or perform GIT merges.</p></div>
417415
<div class="para"><p><em>git-cvsserver</em> maps GIT branches to CVS modules. This is very different
418416
from what most CVS users would expect since in CVS modules usually represent
@@ -423,7 +421,7 @@ <h2 id="_installation">INSTALLATION</h2>
423421
<div class="olist"><ol>
424422
<li>
425423
<p>
426-
If you are going to offer anonymous CVS access via pserver, add a line in
424+
If you are going to offer CVS access via pserver, add a line in
427425
/etc/inetd.conf like
428426
</p>
429427
<div class="listingblock">
@@ -440,6 +438,37 @@ <h2 id="_installation">INSTALLATION</h2>
440438
<pre><tt> cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
441439
</tt></pre>
442440
</div></div>
441+
<div class="para"><p>Only anonymous access is provided by pserve by default. To commit you
442+
will have to create pserver accounts, simply add a gitcvs.authdb
443+
setting in the config file of the repositories you want the cvsserver
444+
to allow writes to, for example:</p></div>
445+
<div class="listingblock">
446+
<div class="content">
447+
<pre><tt>
448+
[gitcvs]
449+
authdb = /etc/cvsserver/passwd
450+
</tt></pre>
451+
</div></div>
452+
<div class="para"><p>The format of these files is username followed by the crypted password,
453+
for example:</p></div>
454+
<div class="listingblock">
455+
<div class="content">
456+
<pre><tt> myuser:$1Oyx5r9mdGZ2
457+
myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./</tt></pre>
458+
</div></div>
459+
<div class="para"><p>You can use the <em>htpasswd</em> facility that comes with Apache to make these
460+
files, but Apache's MD5 crypt method differs from the one used by most C
461+
library's crypt() function, so don't use the -m option.</p></div>
462+
<div class="para"><p>Alternatively you can produce the password with perl's crypt() operator:</p></div>
463+
<div class="listingblock">
464+
<div class="content">
465+
<pre><tt> perl -e 'my ($user, $pass) = @ARGV; printf "%s:%s\n", $user, crypt($user, $pass)' $USER password</tt></pre>
466+
</div></div>
467+
<div class="para"><p>Then provide your password via the pserver method, for example:</p></div>
468+
<div class="listingblock">
469+
<div class="content">
470+
<pre><tt> cvs -d:pserver:someuser:somepassword &lt;at&gt; server/path/repo.git co &lt;HEAD_name&gt;</tt></pre>
471+
</div></div>
443472
<div class="para"><p>No special setup is needed for SSH access, other than having GIT tools
444473
in the PATH. If you have clients that do not accept the CVS_SERVER
445474
environment variable, you can rename <em>git-cvsserver</em> to <tt>cvs</tt>.</p></div>
@@ -806,7 +835,7 @@ <h2 id="_git">GIT</h2>
806835
</div>
807836
<div id="footer">
808837
<div id="footer-text">
809-
Last updated 2010-04-24 02:55:51 UTC
838+
Last updated 2010-06-13 19:56:32 UTC
810839
</div>
811840
</div>
812841
</body>

‎git-cvsserver.txt‎

Lines changed: 33 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,6 @@ plugin. Most functionality works fine with both of these clients.
7272
LIMITATIONS
7373
-----------
7474

75-
Currently cvsserver works over SSH connections for read/write clients, and
76-
over pserver for anonymous CVS access.
77-
7875
CVS clients cannot tag, branch or perform GIT merges.
7976

8077
'git-cvsserver' maps GIT branches to CVS modules. This is very different
@@ -84,7 +81,7 @@ one or more directories.
8481
INSTALLATION
8582
------------
8683

87-
1. If you are going to offer anonymous CVS access via pserver, add a line in
84+
1. If you are going to offer CVS access via pserver, add a line in
8885
/etc/inetd.conf like
8986
+
9087
--
@@ -101,6 +98,38 @@ looks like
10198
cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
10299

103100
------
101+
102+
Only anonymous access is provided by pserve by default. To commit you
103+
will have to create pserver accounts, simply add a gitcvs.authdb
104+
setting in the config file of the repositories you want the cvsserver
105+
to allow writes to, for example:
106+
107+
------
108+
109+
[gitcvs]
110+
authdb = /etc/cvsserver/passwd
111+
112+
------
113+
The format of these files is username followed by the crypted password,
114+
for example:
115+
116+
------
117+
myuser:$1Oyx5r9mdGZ2
118+
myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./
119+
------
120+
You can use the 'htpasswd' facility that comes with Apache to make these
121+
files, but Apache's MD5 crypt method differs from the one used by most C
122+
library's crypt() function, so don't use the -m option.
123+
124+
Alternatively you can produce the password with perl's crypt() operator:
125+
-----
126+
perl -e 'my ($user, $pass) = @ARGV; printf "%s:%s\n", $user, crypt($user, $pass)' $USER password
127+
-----
128+
129+
Then provide your password via the pserver method, for example:
130+
------
131+
cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>
132+
------
104133
No special setup is needed for SSH access, other than having GIT tools
105134
in the PATH. If you have clients that do not accept the CVS_SERVER
106135
environment variable, you can rename 'git-cvsserver' to `cvs`.

‎git-diff-files.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1498,7 +1498,7 @@ <h2 id="_git">GIT</h2>
14981498
</div>
14991499
<div id="footer">
15001500
<div id="footer-text">
1501-
Last updated 2010-05-21 14:57:15 UTC
1501+
Last updated 2010-06-13 19:56:32 UTC
15021502
</div>
15031503
</div>
15041504
</body>

‎git-diff-index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1576,7 +1576,7 @@ <h2 id="_git">GIT</h2>
15761576
</div>
15771577
<div id="footer">
15781578
<div id="footer-text">
1579-
Last updated 2010-05-21 14:57:16 UTC
1579+
Last updated 2010-06-13 19:56:33 UTC
15801580
</div>
15811581
</div>
15821582
</body>

0 commit comments

Comments
 (0)