Skip to content

Instantly share code, notes, and snippets.

Embed
What would you like to do?
GIT Squashing (SAME BRANCH)
GIT Squashing (SAME BRANCH)
> let me rebase all commits for this branch (origin)
(Branch):
git add -A
git commit -m ‘ADCON-xxxx: lalalala'
git rebase -i master
// -i = squash commits: take smaller commits and combine them into larger ones
// here replace: pick -> ‘f' (normally the button on the list of picks)
i f
q!
git whatchanged
q
git whatchanged -1 -p
git push origin WF-xxxx —force
// ERRORs!!!!!
error: could not apply 9ea9b91 … OR [(no branch, rebasing ADCON-xxx)]
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment