git-tips

Some quick git tips: Slides Here

Branched from the wrong branch?

git rebase —onto foo bar 

Forgot to add something to a commit?

git commit —amend -c foobar

Want to switch back to the previous branch?

git checkout -

Want to stage some changes?

git add -p

Want to set upstream?

git push -u origin foobar

Want to push nothing?

git commit —allow-empty -m "foobar"

Want to find out which branch has a commit?

git branch --contains foobar

Want to speed things up?

git gc

Want to undo bad things?

git reflog

Want to find out when things broke?

git bisect start foo bar

Want to squash/delete commits?

git rebase -i foobar

Want to always pull with rebase?

git config --global branch.autosetuprebase always

Want git to be case sensative?

git config --global core.ignorecase false 

Love typos?

git config --global help.autocorrect 1

Like color?

git config —global color.ui 1

Same conflicts?

git config --global rerere.enabled true