From: Junio C Hamano Date: Sat, 17 May 2008 05:10:13 +0000 (-0700) Subject: Merge branch 'maint' X-Git-Tag: v1.5.6-rc0~46 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d2c1c2dc064c40f6c723e0a25b5f813732fdaff?ds=inline;hp=-c Merge branch 'maint' * maint: git-filter-branch: Clarify file removal example. --- 6d2c1c2dc064c40f6c723e0a25b5f813732fdaff diff --combined Documentation/git-filter-branch.txt index 8d80f0d074,4a530965ec..506c37af70 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@@ -133,16 -133,10 +133,16 @@@ use "--tag-name-filter cat" to simply u case, be very careful and make sure you have the old tags backed up in case the conversion has run afoul. + -Note that there is currently no support for proper rewriting of -tag objects; in layman terms, if the tag has a message or signature -attached, the rewritten tag won't have it. Sorry. (It is by -definition impossible to preserve signatures at any rate.) +Nearly proper rewriting of tag objects is supported. If the tag has +a message attached, a new tag object will be created with the same message, +author, and timestamp. If the tag has a signature attached, the +signature will be stripped. It is by definition impossible to preserve +signatures. The reason this is "nearly" proper, is because ideally if +the tag did not change (points to the same object, has the same name, etc.) +it should retain any signature. That is not the case, signatures will always +be removed, buyer beware. There is also no support for changing the +author or timestamp (or the tag message for that matter). Tags which point +to other tags will be rewritten to point to the underlying commit. --subdirectory-filter :: Only look at the history which touches the given subdirectory. @@@ -183,6 -177,10 +183,10 @@@ or copyright violation) from all commit git filter-branch --tree-filter 'rm filename' HEAD ------------------------------------------------------- + However, if the file is absent from the tree of some commit, + a simple `rm filename` will fail for that tree and commit. + Thus you may instead want to use `rm -f filename` as the script. + A significantly faster version: --------------------------------------------------------------------------