nvm alias default <branch_number>
: makes it so you don't have to repeatedly set the node version
git push --force-with-lease
: doesn't overwrite anything the way git push -f
does
git rebase -i HEAD~30
: allows you to modify your last 30 commits (squash, delete, edit, etc) one at a time
git pull -r origin master
(same as git pull --rebase origin master
) : rebases your current branch on the specified branch at the same time as pulling the current state of the specified branch
git merge --ff-only origin
merges only if applying the changes on top won't cause any conflicts. Run from on the branch you want to merge to.