Skip to main content

How to squash multiple commits into one?

Suppose you have commits as follows:

HEAD~0 --> Commit 5 eeeeeee
HEAD~1 --> Commit 4 ddddddd
HEAD~2 --> Commit 3 ccccccc
HEAD~3 --> Commit 2 bbbbbbb
HEAD~4 --> Commit 1 aaaaaaa

If you want to squash commits 3, 4 and 5 and make them as a single commit, run the commands below:

git rebase -i HEAD~3

 3 means, you are squashing the last 3 commits. Update text in editor opened, save and close.
git push -f

 Now, the commits would be as follows:

HEAD~0 --> Squashed Commit fffffff
HEAD~1 --> Commit 2 bbbbbbb
HEAD~2 --> Commit 1 aaaaaaa
Labels:

Comments

Post a Comment

Popular posts from this blog

GoLang - How to check if key exists in map?

package main import "fmt" var m map[string]string func main() { m = make(map[string]string) m["foo"] = "abc" if val, ok := m["foo"]; ok { fmt.Println("foo found -", val) } else { fmt.Println("foo not found") } if val, ok := m["bar"]; ok { fmt.Println("bar found -", val) } else { fmt.Println("bar not found") } } Output: foo found - abc bar not found
Post a Comment
Read more

How to delete commits in Git?

Suppose you have 3 commits with SHAs as follows: HEAD~0 --> Commit 3 ccccccc HEAD~1 --> Commit 2 bbbbbbb HEAD~2 --> Commit 1 aaaaaaa If you want to remove the last two commits (i.e., commits 2 and 3) and make Commit 1 as the latest commit, run the following commands: git reset --hard aaaaaaa git push origin HEAD --force Now, the commit history would be as follows: HEAD~0 --> Commit 1 aaaaaaa
Post a Comment
Read more