Skip to content

Commit faa1e50

Browse files
author
Junio C Hamano
committed
Autogenerated HTML docs for v1.6.0-rc2-22-g71b9
1 parent b53db3c commit faa1e50

18 files changed

Lines changed: 101 additions & 51 deletions

‎RelNotes-1.6.0.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ User visible changes
55
--------------------
66

77
With the default Makefile settings, most of the programs are now
8-
installed outside your $PATH, except for "git", "gitk", "git-gui" and
8+
installed outside your $PATH, except for "git", "gitk" and
99
some server side programs that need to be accessible for technical
1010
reasons. Invoking a git subcommand as "git-xyzzy" from the command
1111
line has been deprecated since early 2006 (and officially announced in
@@ -186,7 +186,7 @@ Updates since v1.5.6
186186

187187
* fast-import and fast-export learned to export and import gitlinks.
188188

189-
* "gitk" left background process behind after begin asked to dig very deep
189+
* "gitk" left background process behind after being asked to dig very deep
190190
history and the user killed the UI; the process is killed when the UI goes
191191
away now.
192192

@@ -248,6 +248,6 @@ this release, unless otherwise noted.
248248

249249
---
250250
exec >/var/tmp/1
251-
O=v1.6.0-rc1-113-gf44bc33
251+
O=v1.6.0-rc2-21-g0bb3a0b
252252
echo O=$(git describe refs/heads/master)
253253
git shortlog --no-merges $O..refs/heads/master ^refs/heads/maint

‎git-commit-tree.html‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -327,11 +327,11 @@ <h2 id="_description">DESCRIPTION</h2>
327327
<div class="para"><p>This is usually not what an end user wants to run directly. See
328328
<a href="git-commit.html">git-commit(1)</a> instead.</p></div>
329329
<div class="para"><p>Creates a new commit object based on the provided tree object and
330-
emits the new commit object id on stdout. If no parent is given then
331-
it is considered to be an initial tree.</p></div>
332-
<div class="para"><p>A commit object usually has 1 parent (a commit after a change) or up
333-
to 16 parents. More than one parent represents a merge of branches
334-
that led to them.</p></div>
330+
emits the new commit object id on stdout.</p></div>
331+
<div class="para"><p>A commit object may have any number of parents. With exactly one
332+
parent, it is an ordinary commit. Having more than one parent makes
333+
the commit a merge between several lines of history. Initial (root)
334+
commits have no parents.</p></div>
335335
<div class="para"><p>While a tree represents a particular directory state of a working
336336
directory, a commit represents that state in "time", and explains how
337337
to get there.</p></div>
@@ -525,7 +525,7 @@ <h2 id="_git">GIT</h2>
525525
</div>
526526
<div id="footer">
527527
<div id="footer-text">
528-
Last updated 2008-07-06 05:16:39 UTC
528+
Last updated 2008-08-10 03:55:18 UTC
529529
</div>
530530
</div>
531531
</body>

‎git-commit-tree.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ This is usually not what an end user wants to run directly. See
1616
linkgit:git-commit[1] instead.
1717

1818
Creates a new commit object based on the provided tree object and
19-
emits the new commit object id on stdout. If no parent is given then
20-
it is considered to be an initial tree.
19+
emits the new commit object id on stdout.
2120

22-
A commit object usually has 1 parent (a commit after a change) or up
23-
to 16 parents. More than one parent represents a merge of branches
24-
that led to them.
21+
A commit object may have any number of parents. With exactly one
22+
parent, it is an ordinary commit. Having more than one parent makes
23+
the commit a merge between several lines of history. Initial (root)
24+
commits have no parents.
2525

2626
While a tree represents a particular directory state of a working
2727
directory, a commit represents that state in "time", and explains how

‎git-fetch.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ <h2 id="_options">OPTIONS</h2>
485485
<dd>
486486
<p>
487487
The canonical format of a &lt;refspec&gt; parameter is
488-
<tt><tt>?&lt;src&gt;:&lt;dst&gt;</tt>; that is, an optional plus <tt></tt></tt>, followed
488+
<tt>+?&lt;src&gt;:&lt;dst&gt;</tt>; that is, an optional plus <tt>&#43;</tt>, followed
489489
by the source ref, followed by a colon <tt>:</tt>, followed by
490490
the destination ref.
491491
</p>
@@ -781,7 +781,7 @@ <h2 id="_git">GIT</h2>
781781
</div>
782782
<div id="footer">
783783
<div id="footer-text">
784-
Last updated 2008-07-22 09:19:09 UTC
784+
Last updated 2008-08-10 03:55:18 UTC
785785
</div>
786786
</div>
787787
</body>

‎git-filter-branch.html‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ <h2>SYNOPSIS</h2>
326326
[--msg-filter &lt;command&gt;] [--commit-filter &lt;command&gt;]
327327
[--tag-name-filter &lt;command&gt;] [--subdirectory-filter &lt;directory&gt;]
328328
[--original &lt;namespace&gt;] [-d &lt;directory&gt;] [-f | --force]
329-
[&lt;rev-list options&gt;&#8230;]</div></div>
329+
[--] [&lt;rev-list options&gt;&#8230;]</div></div>
330330
</div>
331331
<h2 id="_description">DESCRIPTION</h2>
332332
<div class="sectionbody">
@@ -528,10 +528,10 @@ <h2 id="_options">OPTIONS</h2>
528528
</dt>
529529
<dd>
530530
<p>
531-
When options are given after the new branch name, they will
532-
be passed to <em>git-rev-list</em>. Only commits in the resulting
533-
output will be filtered, although the filtered commits can still
534-
reference parents which are outside of that set.
531+
Arguments for <em>git-rev-list</em>. All positive refs included by
532+
these options are rewritten. You may also specify options
533+
such as <em>--all</em>, but you must use <em>--</em> to separate them from
534+
the <em>git-filter-branch</em> options.
535535
</p>
536536
</dd>
537537
</dl></div>
@@ -553,6 +553,15 @@ <h2 id="_examples">Examples</h2>
553553
<pre><tt>git filter-branch --index-filter 'git rm --cached filename' HEAD</tt></pre>
554554
</div></div>
555555
<div class="para"><p>Now, you will get the rewritten history saved in HEAD.</p></div>
556+
<div class="para"><p>To rewrite the repository to look as if <tt>foodir/</tt> had been its project
557+
root, and discard all other history:</p></div>
558+
<div class="listingblock">
559+
<div class="content">
560+
<pre><tt>git filter-branch --subdirectory-filter foodir -- --all</tt></pre>
561+
</div></div>
562+
<div class="para"><p>Thus you can, e.g., turn a library subdirectory into a repository of
563+
its own. Note the <tt>--</tt> that separates <em>filter-branch</em> options from
564+
revision options, and the <tt>--all</tt> to rewrite all branches and tags.</p></div>
556565
<div class="para"><p>To set a commit (which typically is at the tip of another
557566
history) to be the parent of the current initial commit, in
558567
order to paste the other history behind the current history:</p></div>
@@ -665,7 +674,7 @@ <h2 id="_git">GIT</h2>
665674
</div>
666675
<div id="footer">
667676
<div id="footer-text">
668-
Last updated 2008-07-31 22:10:18 UTC
677+
Last updated 2008-08-10 03:55:19 UTC
669678
</div>
670679
</div>
671680
</body>

‎git-filter-branch.txt‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SYNOPSIS
1313
[--msg-filter <command>] [--commit-filter <command>]
1414
[--tag-name-filter <command>] [--subdirectory-filter <directory>]
1515
[--original <namespace>] [-d <directory>] [-f | --force]
16-
[<rev-list options>...]
16+
[--] [<rev-list options>...]
1717

1818
DESCRIPTION
1919
-----------
@@ -168,10 +168,10 @@ to other tags will be rewritten to point to the underlying commit.
168168
'refs/original/', unless forced.
169169

170170
<rev-list options>...::
171-
When options are given after the new branch name, they will
172-
be passed to 'git-rev-list'. Only commits in the resulting
173-
output will be filtered, although the filtered commits can still
174-
reference parents which are outside of that set.
171+
Arguments for 'git-rev-list'. All positive refs included by
172+
these options are rewritten. You may also specify options
173+
such as '--all', but you must use '--' to separate them from
174+
the 'git-filter-branch' options.
175175

176176

177177
Examples
@@ -196,6 +196,17 @@ git filter-branch --index-filter 'git rm --cached filename' HEAD
196196

197197
Now, you will get the rewritten history saved in HEAD.
198198

199+
To rewrite the repository to look as if `foodir/` had been its project
200+
root, and discard all other history:
201+
202+
-------------------------------------------------------
203+
git filter-branch --subdirectory-filter foodir -- --all
204+
-------------------------------------------------------
205+
206+
Thus you can, e.g., turn a library subdirectory into a repository of
207+
its own. Note the `\--` that separates 'filter-branch' options from
208+
revision options, and the `\--all` to rewrite all branches and tags.
209+
199210
To set a commit (which typically is at the tip of another
200211
history) to be the parent of the current initial commit, in
201212
order to paste the other history behind the current history:

‎git-pull.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ <h2 id="_options">OPTIONS</h2>
639639
<dd>
640640
<p>
641641
The canonical format of a &lt;refspec&gt; parameter is
642-
<tt><tt>?&lt;src&gt;:&lt;dst&gt;</tt>; that is, an optional plus <tt></tt></tt>, followed
642+
<tt>+?&lt;src&gt;:&lt;dst&gt;</tt>; that is, an optional plus <tt>&#43;</tt>, followed
643643
by the source ref, followed by a colon <tt>:</tt>, followed by
644644
the destination ref.
645645
</p>
@@ -1149,7 +1149,7 @@ <h2 id="_git">GIT</h2>
11491149
</div>
11501150
<div id="footer">
11511151
<div id="footer-text">
1152-
Last updated 2008-07-22 09:19:13 UTC
1152+
Last updated 2008-08-10 03:55:19 UTC
11531153
</div>
11541154
</div>
11551155
</body>

‎git-push.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ <h2 id="_options">OPTIONS</h2>
350350
</dt>
351351
<dd>
352352
<p>
353-
The canonical format of each &lt;refspec&gt; parameter is
354-
<tt><tt>?&lt;src&gt;:&lt;dst&gt;</tt>; that is, an optional plus <tt></tt></tt>, followed
353+
The canonical format of a &lt;refspec&gt; parameter is
354+
<tt>+?&lt;src&gt;:&lt;dst&gt;</tt>; that is, an optional plus <tt>&#43;</tt>, followed
355355
by the source ref, followed by a colon <tt>:</tt>, followed by
356356
the destination ref.
357357
</p>
@@ -818,7 +818,7 @@ <h2 id="_git">GIT</h2>
818818
</div>
819819
<div id="footer">
820820
<div id="footer-text">
821-
Last updated 2008-07-30 18:31:05 UTC
821+
Last updated 2008-08-10 03:55:20 UTC
822822
</div>
823823
</div>
824824
</body>

‎git-push.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ OPTIONS
3131
operation. See the section <<URLS,GIT URLS>> below.
3232

3333
<refspec>...::
34-
The canonical format of each <refspec> parameter is
35-
`+?<src>:<dst>`; that is, an optional plus `+`, followed
34+
The canonical format of a <refspec> parameter is
35+
`+?<src>:<dst>`; that is, an optional plus `{plus}`, followed
3636
by the source ref, followed by a colon `:`, followed by
3737
the destination ref.
3838
+

‎git-rerere.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,14 +418,14 @@ <h2 id="_discussion">DISCUSSION</h2>
418418
</div></div>
419419
<div class="para"><p>The commits marked with <tt>*</tt> touch the same area in the same
420420
file; you need to resolve the conflicts when creating the commit
421-
marked with <tt>+</tt>. Then you can test the result to make sure your
421+
marked with <tt>&#43;</tt>. Then you can test the result to make sure your
422422
work-in-progress still works with what is in the latest master.</p></div>
423423
<div class="para"><p>After this test merge, there are two ways to continue your work
424424
on the topic. The easiest is to build on top of the test merge
425-
commit <tt><tt></tt>, and when your work in the topic branch is finally
425+
commit <tt>&#43;</tt>, and when your work in the topic branch is finally
426426
ready, pull the topic branch into master, and/or ask the
427427
upstream to pull from you. By that time, however, the master or
428-
the upstream might have been advanced since the test merge <tt></tt></tt>,
428+
the upstream might have been advanced since the test merge <tt>&#43;</tt>,
429429
in which case the final commit graph would look like this:</p></div>
430430
<div class="listingblock">
431431
<div class="content">
@@ -529,7 +529,7 @@ <h2 id="_git">GIT</h2>
529529
</div>
530530
<div id="footer">
531531
<div id="footer-text">
532-
Last updated 2008-07-24 04:02:42 UTC
532+
Last updated 2008-08-10 03:55:20 UTC
533533
</div>
534534
</div>
535535
</body>

0 commit comments

Comments
 (0)