filter-branch: a few more touch ups to the man page
All based on comments from Frank Lichtenheld. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Frank Lichtenheld <frank@lichtenheld.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jul 4, 2007 at 15:50 UTC
73616fd3d21ab5eefc912fa886ff8808e59d6e7e
1 file changed
+6
-5
Documentation/git-filter-branch.txt
+6
-5
@@ -31,7 +31,7 @@ branch as your current branch. Nevertheless, this may be useful in
31
the future for compensating for some git bugs or such, therefore
32
such a usage is permitted.
33
34
-WARNING! The rewritten history will have different object names for all
34
+*WARNING*! The rewritten history will have different object names for all
35
the objects and will not converge with the original branch. You will not
36
be able to easily push and distribute the rewritten branch on top of the
37
original branch. Please do not use this command if you do not know the
@@ -54,7 +54,7 @@ argument is always evaluated in shell using the 'eval' command.
54
Prior to that, the $GIT_COMMIT environment variable will be set to contain
55
the id of the commit being rewritten. Also, GIT_AUTHOR_NAME,
56
GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL,
57
-and GIT_COMMITTER_DATE is set according to the current commit.
57
+and GIT_COMMITTER_DATE are set according to the current commit.
58
59
A 'map' function is available that takes an "original sha1 id" argument
60
and outputs a "rewritten sha1 id" if the commit has been already
@@ -78,7 +78,7 @@ OPTIONS
78
directory set to the root of the checked out tree. The new tree
79
is then used as-is (new files are auto-added, disappeared files
80
are auto-removed - neither .gitignore files nor any other ignore
81
- rules HAVE ANY EFFECT!).
81
+ rules *HAVE ANY EFFECT*!).
82
83
--index-filter <command>::
84
This is the filter for rewriting the index. It is similar to the
@@ -128,8 +128,9 @@ attached, the rewritten tag won't have it. Sorry. (It is by
128
definition impossible to preserve signatures at any rate.)
129
130
--subdirectory-filter <directory>::
131
- Only ever look at the history, which touches the given subdirectory.
132
- The result will contain that directory as its project root.
131
+ Only look at the history which touches the given subdirectory.
132
+ The result will contain that directory (and only that) as its
133
+ project root.
134
135
-d <directory>::
136
Use this option to set the path to the temporary directory used for