Created
December 11, 2018 14:50
-
-
Save leolanese/38401d2c234da25d0f47efe4498f3162 to your computer and use it in GitHub Desktop.
GIT Squashing (SAME BRANCH)
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 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