-
-
Save csebille/19da6fabfc3a62810371d1bf907daa2b to your computer and use it in GitHub Desktop.
git squash last two commits into one
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| git rebase --interactive HEAD~2 | |
| # we are going to squash c into b | |
| pick b76d157 b | |
| pick a931ac7 c | |
| # squash c into b | |
| pick b76d157 b | |
| s a931ac7 c | |
| # after that just edit the commit message | |
| # This is a combination of 2 commits. | |
| # The first commit's message is: | |
| b | |
| # This is the 2nd commit message: | |
| c |
Author
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
from comment in forked gist 👍
Great gist. FYI for convenience you can make the parameter of the fixup git alias optional and set it to a default value of 1 by replacing ${1} with ${1-1}, e.g.:
fixup = "!f(){ git reset --soft HEAD~${1-1} && git commit --amend -C HEAD; };f"
So then you can just do:
git fixup # merges the last commit into its parent