Saturday, December 16, 2017

Git squash Notes

git rebase -i HEAD~3
git log --pretty=oneline -n 10

Change numbers to find where exactly we need to do HEAD~n
git rebase --abort
git push -f origin branch-name
gitk
gitx

vi commands
/pick
cw - change word
squash
n
.

https://robots.thoughtbot.com/git-interactive-rebase-squash-amend-rewriting-history