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
As of Git version 1.7.12, you may now use git rebase -i –root Documentation
As of git 1.6.2, you can use git rebase –root -i. For each commit except the first, change pick to squash.
Note that, starting Git 2.24 (Q4 2019), the list above might not need to include git filter-branch anymore. git filter-branch is being deprecated (BFG too) See commit 483e861, commit 9df53c5, commit 7b6ad97 (04 Sep 2019) by Elijah Newren (newren). (Merged by Junio C Hamano — gitster — in commit 91243b0, 30 Sep 2019) Recommend git-filter-repo … Read more
Please don’t use this recipe if your situation is not the one described in the question. This recipe is for fixing a bad merge, and replaying your good commits onto a fixed merge. Although filter-branch will do what you want, it is quite a complex command and I would probably choose to do this with … Read more
For all practical purposes, the first thing you should be worried about is CHANGING YOUR PASSWORDS! It’s not clear from your question whether your git repository is entirely local or whether you have a remote repository elsewhere yet; if it is remote and not secured from others you have a problem. If anyone has cloned … Read more
How to change the author and committer name and e-mail of multiple commits in Git?
You can use git rebase. For example, if you want to modify commit bbc643cd, run $ git rebase –interactive ‘bbc643cd^’ Please note the caret ^ at the end of the command, because you need actually to rebase back to the commit before the one you wish to modify. In the default editor, modify pick to … Read more
Amending the most recent commit message git commit –amend will open your editor, allowing you to change the commit message of the most recent commit. Additionally, you can set the commit message directly in the command line with: git commit –amend -m “New commit message” …however, this can make multi-line commit messages or small corrections … Read more