summaryrefslogtreecommitdiffstats
path: root/git-filter-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-09-15 22:17:51 +0000
committerJunio C Hamano <junio@kernel.org>2010-09-15 22:17:51 +0000
commitf17c1de0d92497d4b6cc8e396c7419cd7ee0e709 (patch)
tree7fa98faa3d30d62464502c42334d43dfde72a5c6 /git-filter-branch.html
parent05d16cadd12dc85dec5029ce5256224c8d0a0f59 (diff)
downloadgit-htmldocs-f17c1de0d92497d4b6cc8e396c7419cd7ee0e709.tar.gz
Autogenerated HTML docs for v1.7.3-rc2
Diffstat (limited to 'git-filter-branch.html')
-rw-r--r--git-filter-branch.html27
1 files changed, 9 insertions, 18 deletions
diff --git a/git-filter-branch.html b/git-filter-branch.html
index b63cdf15e..e4e5223a6 100644
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -495,25 +495,10 @@ to other tags will be rewritten to point to the underlying commit.</p></div>
<p>
Only look at the history which touches the given subdirectory.
The result will contain that directory (and only that) as its
- project root. Implies --remap-to-ancestor.
+ project root. Implies <a href="#Remap_to_ancestor">[Remap_to_ancestor]</a>.
</p>
</dd>
<dt>
---remap-to-ancestor
-</dt>
-<dd>
-<p>
- Rewrite refs to the nearest rewritten ancestor instead of
- ignoring them.
-</p>
-<div class="para"><p>Normally, positive refs on the command line are only changed if the
-commit they point to was rewritten. However, you can limit the extent
-of this rewriting by using <a href="rev-list.html">rev-list(1)</a> arguments, e.g., path
-limiters. Refs pointing to such excluded commits would then normally
-be ignored. With this option, they are instead rewritten to point at
-the nearest ancestor that was not excluded.</p></div>
-</dd>
-<dt>
--prune-empty
</dt>
<dd>
@@ -571,10 +556,16 @@ the nearest ancestor that was not excluded.</p></div>
Arguments for <em>git rev-list</em>. All positive refs included by
these options are rewritten. You may also specify options
such as <em>--all</em>, but you must use <em>--</em> to separate them from
- the <em>git filter-branch</em> options.
+ the <em>git filter-branch</em> options. Implies <a href="#Remap_to_ancestor">[Remap_to_ancestor]</a>.
</p>
</dd>
</dl></div>
+<h3 id="Remap_to_ancestor">Remap to ancestor</h3><div style="clear:left"></div>
+<div class="para"><p>By using <a href="rev-list.html">rev-list(1)</a> arguments, e.g., path limiters, you can limit the
+set of revisions which get rewritten. However, positive refs on the command
+line are distinguished: we don't let them be excluded by such limiters. For
+this purpose, they are instead rewritten to point at the nearest ancestor that
+was not excluded.</p></div>
</div>
<h2 id="_examples">Examples</h2>
<div class="sectionbody">
@@ -787,7 +778,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2010-09-03 21:30:17 UTC
+Last updated 2010-09-15 22:17:35 UTC
</div>
</div>
</body>