Just add on the –prune-empty option: git filter-branch –tree-filter ‘rm -rf my_folder’ –prune-empty -f HEAD (And of course, if you have other refs, you might want to rewrite everything with — –all instead of just HEAD.) Note that this isn’t compatible with –commit-filter; in that case, Charles Bailey has your answer.
In your case, use git filter-branch instead of git rm. git rm will delete the files in the sense that they will not be tracked by git anymore, but that does not remove the old commit objects corresponding to those images, and so you will still be stuck with pushing the earlier commits which correspond … Read more
I’ve written a script that does this. $ git-rebase-tags master Rebasing 107 tags onto ‘master’ Can’t rebase tag ‘staging-deploy-01’ because there are no identical commits on ‘master’ Pointed tag ‘v0.0.11’ at commit 81e16f2ca1bc7802547bf19c1dba1a68212eafff Pointed tag ‘v0.0.12’ at commit 17051cc28084dd56ae56e96767bceee46217c02d Pointed tag ‘v0.0.13’ at commit 5d795076ba4b33f81d327dcf9bff727cef7771a2 […] See gist.github.com/908381. But even better, use the –tag-name-filter option … Read more
I resolved my own question, here is the solution: git-submodule-split library another_library Script git-submodule-split: #!/bin/bash set -eu if [ $# -eq 0 ] then echo “Usage: $0 submodules-to-split” fi export _tmp=$(mktemp -d) export _libs=”$@” for i in $_libs do mkdir -p $_tmp/$i done git filter-branch –commit-filter ‘ function gitCommit() { git add -A if [ … Read more
You need to specify –tag-name-filter cat to rewrite tags as well Now, you could do git filter-branch –tag-name-filter cat …other filter options… — –tags where …other filter options… repeats the filters you previously applied.
You cannot apply the filter-branch in the middle of the history, as said by @kan. You must apply from your known commit to the end of the history git filter-branch –env-filter ‘…’ SHA1..HEAD Filter-branch can check for the commit author or other information, to chose to change or not the commit, so there are ways … Read more
Yes, your solution will work. You also have another option: instead of doing this on the central repo, run the filter on your clone and then push it back with git push –force –all. This will force the server to accept the new branches from your repository. This replaces step 2 only; the other steps … Read more
A faster and easier-to-understand filter that accomplishes the same thing: git filter-branch –index-filter ‘ git read-tree –empty git reset $GIT_COMMIT — $your $files $here ‘ \ — –all — $your $files $here
To rewrite the history with the files moved: If you want the project’s history to look as though all files have always been in the directory foo/bar, then you need to do a little surgery. Use git filter-branch with the “tree filter” to rewrite the commits so that anywhere foo/bar doesn’t exist, it is created … Read more
Use git-filter-branch. git filter-branch –commit-filter ‘if [ “$GIT_AUTHOR_NAME” = “Josh Lee” ]; then export GIT_AUTHOR_NAME=”Hobo Bob”; export [email protected]; fi; git commit-tree “$@”‘ This only affects the author, not the committer (which for most commits will be the same as the author). If you want to rewrite those as well, set the GIT_COMMITTER_NAME and GIT_COMMITTER_EMAIL variables. … Read more