The solution is simple: git filter-branch [options] — –all Note the four dashes (two sets of double dashes with a space in between) in — –all. If you look at the docs for git-filter-branch, it says this: git filter-branch [–env-filter <command>] [–tree-filter <command>] [–index-filter <command>] [–parent-filter <command>] [–msg-filter <command>] [–commit-filter <command>] [–tag-name-filter <command>] [–subdirectory-filter <directory>] … Read more
I can’t say for sure without access to your repository data, but I believe there are probably one or more packed refs still referencing old commits from before you ran git filter-branch. This would explain why git fsck –full –unreachable doesn’t call the large blob an unreachable object, even though you’ve expired your reflog and … Read more
You can do it using the git filter-branch command, like this : git filter-branch –index-filter “git rm -rf –cached –ignore-unmatch path_to_file” HEAD You can find more documentation here http://dalibornasevic.com/posts/2-permanently-remove-files-and-folders-from-a-git-repository
You have already performed a filter-branch operation. After filter-branch, Git keeps refs to the old commits around, in case something goes wrong. You can find those in .git/refs/original/…. Either delete that directory and all files within, or use the -f flag to force Git to delete the old references. git filter-branch -f \ –index-filter ‘git … Read more
refs/original/* is there as a backup, in case you mess up your filter-branch. Believe me, it’s a really good idea. Once you’ve inspected the results, and you’re very confident that you have what you want, you can remove the backed up ref: git update-ref -d refs/original/refs/heads/master or if you did this to many refs, and … Read more
Use git rebase -i –root as of Git version 1.7.12. In the interactive rebase file, change the second line of commit B to squash and leave the other lines at pick: pick f4202da A squash bea708e B pick a8c6abc C This will combine the two commits A and B to one commit AB. Found in … Read more
git rebase -i HEAD^^^ Now mark the ones you want to amend with edit or e (replace pick). Now save and exit. Now make your changes, then git add . git rebase –continue If you want to add an extra delete remove the options from the commit command. If you want to adjust the message, … Read more
There are two options here. One is to do an interactive rebase and edit the merge commit, redo the merge manually and continue the rebase. Another is to use the –rebase-merges option on git rebase, which is described as follows from the manual: By default, a rebase will simply drop merge commits from the todo … Read more
Warning: now deprecated in favor of filter-repo. Rebase/amend seems inefficient, when you have the power of filter-branch at your fingertips: git filter-branch –env-filter ‘if [ “$GIT_AUTHOR_EMAIL” = “incorrect@email” ]; then GIT_AUTHOR_EMAIL=correct@email; GIT_AUTHOR_NAME=”Correct Name”; GIT_COMMITTER_EMAIL=$GIT_AUTHOR_EMAIL; GIT_COMMITTER_NAME=”$GIT_AUTHOR_NAME”; fi’ — –all (split across lines for clarity, but not necessary) Be sure to inspect the result when you’re done, … Read more
As of Git version 1.7.12, you may now use git rebase -i –root Documentation