Commit 641ee08

authored

Squash all commits in a branch to a single commit

1 parent daf558a commit 641ee08Copy full SHA for 641ee08

File tree

-0

lines changed

-0

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -381,6 +381,14 @@ git config --global delta.side-by-side true`
`381`	`381`	`# Find which commit added a specific file eg foo.cpp`
`382`	`382`	`# https://stackoverflow.com/q/11533199`
`383`	`383`	`git log --follow --diff-filter=A --find-renames=40% foo.cpp`
	`384`	`+`
	`385`	`+# Squash all commits in a branch to a single commit without git rebase`
	`386`	`+# https://stackoverflow.com/a/25357146`
	`387`	`+git checkout my_branch`
	`388`	`+git reset $(git merge-base main $(git rev-parse --abbrev-ref HEAD))`
	`389`	`+git add .`
	`390`	`+git commit -m "one commit to rule them all`
	`391`	`+`
`384`	`392`	```
`385`	`393`
`386`	`394`	`[Atlassian Git Tutorials](https://www.atlassian.com/git/tutorials)`

Comments

(0)