Use the BFG Repo-Cleaner, a simpler, faster alternative to git-filter-branch, specifically designed for removing unwanted files from Git history. Carefully follow the usage instructions. The core part is just this: java -jar bfg.jar –strip-blobs-bigger-than 100M my-repo.git Any files over 100 MB in size (that aren’t in your latest commit) will be removed from your Git … 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
In your case, you can rebase interactive: git rebase -i HEAD~4 Then you can just reorder your picks For example lets add three more files to our branch: git add A git commit -m “A” git add B git commit -m “B” git add C git commit -m “C” Your shortlog will be: $ git … Read more
NOTE: This answer changes SHA1s, so take care when using it on a branch that has already been pushed. If you only want to fix the spelling of a name or update an old email, Git lets you do this without rewriting history using .mailmap. See my other answer. Using Rebase First, if you haven’t … Read more
In order not to lose some history; better first take a copy of your repository :). Here we go: (<f> is the sha of the commit f that you want to be the new root commit) git checkout –orphan temp <f> # checkout to the status of the git repo at commit f; creating a … Read more
“reword” allows you to change ONLY the commit message, NOT the commit contents “edit” allows you to change BOTH commit contents AND commit message (the mechanism by which git allows you to edit the commit contents is by “pausing” the rebase; so you can amend the commit) reference : The git-rebase documentation says this: edit … Read more
You can indeed do his for many commits at once like this: git rebase -i HEAD~40 -x “git commit –amend –author ‘Author Name <author.name@mail.com>’ –no-edit” I worked this out better in this answer.
I’d recommend using the BFG Repo-Cleaner, a simpler, faster alternative to git-filter-branch specifically designed for rewriting files from Git history. You should carefully follow these steps here: https://rtyley.github.io/bfg-repo-cleaner/#usage – but the core bit is just this: download the BFG’s jar (requires Java 7 or above) and run this command: $ java -jar bfg.jar –replace-text replacements.txt … Read more
The argument to –delete-folders is a glob expression, so you should be able to just comma-separate the folder names, like this: $ bfg –delete-folders “{folderA,folderB,folderC}” my-repo.git Good luck! Full disclosure: I’m the author of the BFG Repo-Cleaner.
First approach, through Git configuration: git -c core.editor=true rebase –continue Or, with environment variables: GIT_EDITOR=true git rebase –continue This will override the editor that git uses for message confirmation. true command simply ends with zero exit code. It makes git continue rebase as if user closed interactive editor. On Windows, you would need to use … Read more