Git
From John Freier
Revision as of 14:54, 6 May 2020 by Jfreier (Talk | contribs) (Created page with " == Rebase == When you are on a branch, you get git rebase master == Squash feature branch == This squashes all the commits in to one. git merge --squash feature and...")
Rebase
When you are on a branch, you get
git rebase master
Squash feature branch
This squashes all the commits in to one.
git merge --squash feature
and then you need to commit the new squashed changes.
get commit -m "squashed changes merged in."
