Skip to content

Commit 4bf6dca

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.4.4.3-gc902c
1 parent 52401ef commit 4bf6dca

6 files changed

Lines changed: 29 additions & 65 deletions

File tree

‎git-clone.html‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,7 @@ <h2>SYNOPSIS</h2>
275275
<div class="verseblock">
276276
<div class="content"><em>git-clone</em> [--template=&lt;template_directory&gt;] [-l [-s]] [-q] [-n] [--bare]
277277
[-o &lt;name&gt;] [-u &lt;upload-pack&gt;] [--reference &lt;repository&gt;]
278-
[--use-separate-remote | --no-separate-remote] &lt;repository&gt;
279-
[&lt;directory&gt;]</div></div>
278+
&lt;repository&gt; [&lt;directory&gt;]</div></div>
280279
</div>
281280
<h2>DESCRIPTION</h2>
282281
<div class="sectionbody">
@@ -417,28 +416,6 @@ <h2>OPTIONS</h2>
417416
</p>
418417
</dd>
419418
<dt>
420-
--use-separate-remote
421-
</dt>
422-
<dd>
423-
<p>
424-
Save remotes heads under <tt>$GIT_DIR/refs/remotes/origin/</tt> instead
425-
of <tt>$GIT_DIR/refs/heads/</tt>. Only the local master branch is
426-
saved in the latter. This is the default.
427-
</p>
428-
</dd>
429-
<dt>
430-
--no-separate-remote
431-
</dt>
432-
<dd>
433-
<p>
434-
Save remotes heads in the same namespace as the local
435-
heads, `$GIT_DIR/refs/heads/'. In regular repositories,
436-
this is a legacy setup git-clone created by default in
437-
older Git versions, and will be removed before the next
438-
major release.
439-
</p>
440-
</dd>
441-
<dt>
442419
&lt;repository&gt;
443420
</dt>
444421
<dd>
@@ -533,7 +510,7 @@ <h2>GIT</h2>
533510
</div>
534511
<div id="footer">
535512
<div id="footer-text">
536-
Last updated 16-Dec-2006 22:16:25 UTC
513+
Last updated 21-Dec-2006 02:25:49 UTC
537514
</div>
538515
</div>
539516
</body>

‎git-clone.txt‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ SYNOPSIS
1111
[verse]
1212
'git-clone' [--template=<template_directory>] [-l [-s]] [-q] [-n] [--bare]
1313
[-o <name>] [-u <upload-pack>] [--reference <repository>]
14-
[--use-separate-remote | --no-separate-remote] <repository>
15-
[<directory>]
14+
<repository> [<directory>]
1615

1716
DESCRIPTION
1817
-----------
@@ -99,18 +98,6 @@ OPTIONS
9998
if unset the templates are taken from the installation
10099
defined default, typically `/usr/share/git-core/templates`.
101100

102-
--use-separate-remote::
103-
Save remotes heads under `$GIT_DIR/refs/remotes/origin/` instead
104-
of `$GIT_DIR/refs/heads/`. Only the local master branch is
105-
saved in the latter. This is the default.
106-
107-
--no-separate-remote::
108-
Save remotes heads in the same namespace as the local
109-
heads, `$GIT_DIR/refs/heads/'. In regular repositories,
110-
this is a legacy setup git-clone created by default in
111-
older Git versions, and will be removed before the next
112-
major release.
113-
114101
<repository>::
115102
The (possibly remote) repository to clone from. It can
116103
be any URL git-fetch supports.

‎git-diff.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ <h2>NAME</h2>
272272
</div>
273273
<h2>SYNOPSIS</h2>
274274
<div class="sectionbody">
275-
<p><em>git-diff</em> [ --diff-options ] &lt;tree-ish&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p>
275+
<p><em>git-diff</em> [ --diff-options ] &lt;commit&gt;{0,2} [--] [&lt;path&gt;&#8230;]</p>
276276
</div>
277277
<h2>DESCRIPTION</h2>
278278
<div class="sectionbody">
@@ -297,7 +297,7 @@ <h2>DESCRIPTION</h2>
297297
<dd>
298298
<p>
299299
This form is to view the changes you staged for the next
300-
commit relative to the named &lt;tree-ish&gt;. Typically you
300+
commit relative to the named &lt;commit&gt;. Typically you
301301
would want comparison with the latest commit, so if you
302302
do not give &lt;commit&gt;, it defaults to HEAD.
303303
</p>
@@ -815,7 +815,7 @@ <h2>GIT</h2>
815815
</div>
816816
<div id="footer">
817817
<div id="footer-text">
818-
Last updated 16-Dec-2006 07:43:51 UTC
818+
Last updated 21-Dec-2006 02:25:50 UTC
819819
</div>
820820
</div>
821821
</body>

‎git-diff.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ git-diff - Show changes between commits, commit and working tree, etc
88

99
SYNOPSIS
1010
--------
11-
'git-diff' [ --diff-options ] <tree-ish>{0,2} [--] [<path>...]
11+
'git-diff' [ --diff-options ] <commit>{0,2} [--] [<path>...]
1212

1313
DESCRIPTION
1414
-----------
@@ -26,7 +26,7 @@ tree and the index file, or the index file and the working tree.
2626
'git-diff' [--options] --cached [<commit>] [--] [<path>...]::
2727

2828
This form is to view the changes you staged for the next
29-
commit relative to the named <tree-ish>. Typically you
29+
commit relative to the named <commit>. Typically you
3030
would want comparison with the latest commit, so if you
3131
do not give <commit>, it defaults to HEAD.
3232

‎git-svn.html‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ <h2>COMMANDS</h2>
336336
against the latest changes in the SVN repository.
337337
An optional command-line argument may be specified as an
338338
alternative to HEAD.
339-
This is advantageous over <em>commit</em> (below) because it produces
339+
This is advantageous over <em>set-tree</em> (below) because it produces
340340
cleaner, more linear history.
341341
</p>
342342
</dd>
@@ -378,7 +378,7 @@ <h2>COMMANDS</h2>
378378
</div></div>
379379
</dd>
380380
<dt>
381-
<em>commit</em>
381+
<em>set-tree</em>
382382
</dt>
383383
<dd>
384384
<p>
@@ -510,7 +510,7 @@ <h2>OPTIONS</h2>
510510
</dt>
511511
<dd>
512512
<p>
513-
Only used with the <em>commit</em> command.
513+
Only used with the <em>set-tree</em> command.
514514
</p>
515515
<p>Read a list of commits from stdin and commit them in reverse
516516
order. Only the leading sha1 is read from each line, so
@@ -521,7 +521,7 @@ <h2>OPTIONS</h2>
521521
</dt>
522522
<dd>
523523
<p>
524-
Only used with the <em>dcommit</em>, <em>commit</em> and <em>commit-diff</em> commands.
524+
Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
525525
</p>
526526
<p>Remove directories from the SVN tree if there are no files left
527527
behind. SVN can version empty directories, and they are not
@@ -538,7 +538,7 @@ <h2>OPTIONS</h2>
538538
</dt>
539539
<dd>
540540
<p>
541-
Only used with the <em>dcommit</em>, <em>commit</em> and <em>commit-diff</em> commands.
541+
Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
542542
</p>
543543
<p>Edit the commit message before committing to SVN. This is off by
544544
default for objects that are commits, and forced on when committing
@@ -553,7 +553,7 @@ <h2>OPTIONS</h2>
553553
</dt>
554554
<dd>
555555
<p>
556-
Only used with the <em>dcommit</em>, <em>commit</em> and <em>commit-diff</em> commands.
556+
Only used with the <em>dcommit</em>, <em>set-tree</em> and <em>commit-diff</em> commands.
557557
</p>
558558
<p>They are both passed directly to git-diff-tree see
559559
<a href="git-diff-tree.html">git-diff-tree(1)</a> for more information.</p>
@@ -662,7 +662,7 @@ <h2>ADVANCED OPTIONS</h2>
662662
</dt>
663663
<dd>
664664
<p>
665-
Used with <em>fetch</em>, <em>dcommit</em> or <em>commit</em>.
665+
Used with <em>fetch</em>, <em>dcommit</em> or <em>set-tree</em>.
666666
</p>
667667
<p>This can be used to join arbitrary git branches to remotes/git-svn
668668
on new commits where the tree object is equivalent.</p>
@@ -797,10 +797,10 @@ <h3>Basic Examples</h3>
797797
<h2>REBASE VS. PULL</h2>
798798
<div class="sectionbody">
799799
<p>Originally, git-svn recommended that the remotes/git-svn branch be
800-
pulled from. This is because the author favored <em>git-svn commit B</em>
801-
to commit a single head rather than the <em>git-svn commit A..B</em> notation
800+
pulled from. This is because the author favored <em>git-svn set-tree B</em>
801+
to commit a single head rather than the <em>git-svn set-tree A..B</em> notation
802802
to commit multiple commits.</p>
803-
<p>If you use <em>git-svn commit A..B</em> to commit several diffs and you do not
803+
<p>If you use <em>git-svn set-tree A..B</em> to commit several diffs and you do not
804804
have the latest remotes/git-svn merged into my-branch, you should use
805805
<em>git rebase</em> to update your work branch instead of <em>git pull</em>. <em>pull</em>
806806
can cause non-linear history to be flattened when committing into SVN,
@@ -907,7 +907,7 @@ <h2>Documentation</h2>
907907
</div>
908908
<div id="footer">
909909
<div id="footer-text">
910-
Last updated 13-Dec-2006 06:35:40 UTC
910+
Last updated 21-Dec-2006 02:25:50 UTC
911911
</div>
912912
</div>
913913
</body>

‎git-svn.txt‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ manually joining branches on commit.
6464
against the latest changes in the SVN repository.
6565
An optional command-line argument may be specified as an
6666
alternative to HEAD.
67-
This is advantageous over 'commit' (below) because it produces
67+
This is advantageous over 'set-tree' (below) because it produces
6868
cleaner, more linear history.
6969

7070
'log'::
@@ -89,7 +89,7 @@ manually joining branches on commit.
8989

9090
Any other arguments are passed directly to `git log'
9191

92-
'commit'::
92+
'set-tree'::
9393
You should consider using 'dcommit' instead of this command.
9494
Commit specified commit or tree objects to SVN. This relies on
9595
your imported fetch data being up-to-date. This makes
@@ -172,15 +172,15 @@ This can allow you to make partial mirrors when running fetch.
172172
-::
173173
--stdin::
174174

175-
Only used with the 'commit' command.
175+
Only used with the 'set-tree' command.
176176

177177
Read a list of commits from stdin and commit them in reverse
178178
order. Only the leading sha1 is read from each line, so
179179
git-rev-list --pretty=oneline output can be used.
180180

181181
--rmdir::
182182

183-
Only used with the 'dcommit', 'commit' and 'commit-diff' commands.
183+
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
184184

185185
Remove directories from the SVN tree if there are no files left
186186
behind. SVN can version empty directories, and they are not
@@ -193,7 +193,7 @@ repo-config key: svn.rmdir
193193
-e::
194194
--edit::
195195

196-
Only used with the 'dcommit', 'commit' and 'commit-diff' commands.
196+
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
197197

198198
Edit the commit message before committing to SVN. This is off by
199199
default for objects that are commits, and forced on when committing
@@ -204,7 +204,7 @@ repo-config key: svn.edit
204204
-l<num>::
205205
--find-copies-harder::
206206

207-
Only used with the 'dcommit', 'commit' and 'commit-diff' commands.
207+
Only used with the 'dcommit', 'set-tree' and 'commit-diff' commands.
208208

209209
They are both passed directly to git-diff-tree see
210210
gitlink:git-diff-tree[1] for more information.
@@ -276,7 +276,7 @@ ADVANCED OPTIONS
276276

277277
-b<refname>::
278278
--branch <refname>::
279-
Used with 'fetch', 'dcommit' or 'commit'.
279+
Used with 'fetch', 'dcommit' or 'set-tree'.
280280

281281
This can be used to join arbitrary git branches to remotes/git-svn
282282
on new commits where the tree object is equivalent.
@@ -392,11 +392,11 @@ REBASE VS. PULL
392392
---------------
393393

394394
Originally, git-svn recommended that the remotes/git-svn branch be
395-
pulled from. This is because the author favored 'git-svn commit B'
396-
to commit a single head rather than the 'git-svn commit A..B' notation
395+
pulled from. This is because the author favored 'git-svn set-tree B'
396+
to commit a single head rather than the 'git-svn set-tree A..B' notation
397397
to commit multiple commits.
398398

399-
If you use 'git-svn commit A..B' to commit several diffs and you do not
399+
If you use 'git-svn set-tree A..B' to commit several diffs and you do not
400400
have the latest remotes/git-svn merged into my-branch, you should use
401401
'git rebase' to update your work branch instead of 'git pull'. 'pull'
402402
can cause non-linear history to be flattened when committing into SVN,

0 commit comments

Comments
 (0)