summaryrefslogtreecommitdiffstats
path: root/git-filter-branch.html
diff options
context:
space:
mode:
authorJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
committerJunio C Hamano <junio@kernel.org>2010-01-21 17:46:43 +0000
commit1aa40d2e3f5186afb805e7020577acb9f5f78b89 (patch)
tree72812d480799e16b94f9cfed423b8d7d45c7fb4f /git-filter-branch.html
parenta9701f0184382d8de7380c56558718915905746a (diff)
downloadgit-htmldocs-1aa40d2e3f5186afb805e7020577acb9f5f78b89.tar.gz
Autogenerated HTML docs for v1.6.6.1-383-g5a9f
Diffstat (limited to 'git-filter-branch.html')
-rw-r--r--git-filter-branch.html26
1 files changed, 13 insertions, 13 deletions
diff --git a/git-filter-branch.html b/git-filter-branch.html
index a4956e4f4..3dd6e3ce9 100644
--- a/git-filter-branch.html
+++ b/git-filter-branch.html
@@ -447,7 +447,7 @@ multiple commits.</p></div>
<p>
This is the filter for performing the commit.
If this filter is specified, it will be called instead of the
- <em>git-commit-tree</em> command, with arguments of the form
+ <em>git commit-tree</em> command, with arguments of the form
"&lt;TREE_ID&gt; [-p &lt;PARENT_COMMIT_ID&gt;]&#8230;" and the log message on
stdin. The commit id is expected on stdout.
</p>
@@ -457,9 +457,9 @@ have all of them as parents.</p></div>
<div class="para"><p>You can use the <em>map</em> convenience function in this filter, and other
convenience functions, too. For example, calling <em>skip_commit "$@"</em>
will leave out the current commit (but not its changes! If you want
-that, use <em>git-rebase</em> instead).</p></div>
-<div class="para"><p>You can also use the <em>git_commit_non_empty_tree "$@"</em> instead of
-<em>git commit-tree "$@"</em> if you don't wish to keep commits with a single parent
+that, use <em>git rebase</em> instead).</p></div>
+<div class="para"><p>You can also use the <tt>git_commit_non_empty_tree "$@"</tt> instead of
+<tt>git commit-tree "$@"</tt> if you don't wish to keep commits with a single parent
and that makes no change to the tree.</p></div>
</dd>
<dt>
@@ -524,7 +524,7 @@ the nearest ancestor that was not excluded.</p></div>
and only one parent, it will hence keep merges points. Also, this
option is not compatible with the use of <em>--commit-filter</em>. Though you
just need to use the function <em>git_commit_non_empty_tree "$@"</em> instead
- of the <em>git commit-tree "$@"</em> idiom in your commit filter to make that
+ of the <tt>git commit-tree "$@"</tt> idiom in your commit filter to make that
happen.
</p>
</dd>
@@ -558,7 +558,7 @@ the nearest ancestor that was not excluded.</p></div>
</dt>
<dd>
<p>
- <em>git-filter-branch</em> refuses to start with an existing temporary
+ <em>git filter-branch</em> refuses to start with an existing temporary
directory or when there are already refs starting with
<em>refs/original/</em>, unless forced.
</p>
@@ -568,10 +568,10 @@ the nearest ancestor that was not excluded.</p></div>
</dt>
<dd>
<p>
- Arguments for <em>git-rev-list</em>. All positive refs included by
+ 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.
</p>
</dd>
</dl></div>
@@ -587,7 +587,7 @@ or copyright violation) from all commits:</p></div>
<div class="para"><p>However, if the file is absent from the tree of some commit,
a simple <tt>rm filename</tt> will fail for that tree and commit.
Thus you may instead want to use <tt>rm -f filename</tt> as the script.</p></div>
-<div class="para"><p>Using <tt>--index-filter</tt> with <em>git-rm</em> yields a significantly faster
+<div class="para"><p>Using <tt>--index-filter</tt> with <em>git rm</em> yields a significantly faster
version. Like with using <tt>rm filename</tt>, <tt>git rm --cached filename</tt>
will fail if the file is absent from the tree of a commit. If you
want to "completely forget" a file, it does not matter when it entered
@@ -659,7 +659,7 @@ committed a merge between P1 and P2, it will be propagated properly
and all children of the merge will become merge commits with P1,P2
as their parents instead of the merge commit.</p></div>
<div class="para"><p>You can rewrite the commit log messages using <tt>--msg-filter</tt>. For
-example, <em>git-svn-id</em> strings in a repository created by <em>git-svn</em> can
+example, <em>git svn-id</em> strings in a repository created by <em>git svn</em> can
be removed this way:</p></div>
<div class="listingblock">
<div class="content">
@@ -669,7 +669,7 @@ be removed this way:</p></div>
</div></div>
<div class="para"><p>To restrict rewriting to only part of the history, specify a revision
range in addition to the new branch name. The new branch name will
-point to the top-most revision that a <em>git-rev-list</em> of this range
+point to the top-most revision that a <em>git rev-list</em> of this range
will print.</p></div>
<div class="para"><p>If you need to add <em>Acked-by</em> lines to, say, the last 10 commits (none
of which is a merge), use this command:</p></div>
@@ -683,7 +683,7 @@ of which is a merge), use this command:</p></div>
<div class="para"><p><strong>NOTE</strong> the changes introduced by the commits, and which are not reverted
by subsequent commits, will still be in the rewritten branch. If you want
to throw out _changes_ together with the commits, you should use the
-interactive mode of <em>git-rebase</em>.</p></div>
+interactive mode of <em>git rebase</em>.</p></div>
<div class="para"><p>Consider this history:</p></div>
<div class="listingblock">
<div class="content">
@@ -787,7 +787,7 @@ and the git list &lt;git@vger.kernel.org&gt;</p></div>
</div>
<div id="footer">
<div id="footer-text">
-Last updated 2009-12-03 09:12:35 UTC
+Last updated 2010-01-21 17:44:28 UTC
</div>
</div>
</body>