[alias] rb = rebase -S co = checkout ci = commit -S ic = commit -S cp = cherry-pick -S br = branch st = status lg = log --graph --format='%C(yellow)%h%Creset -%C(auto)%d%Creset %s %C(green)(%ar) %C(cyan)<%an>%Creset' branches = branch -a desc = describe last = log -1 HEAD pom = pull origin master remotes = remote -v tags = tag -l unstage = reset HEAD -- ft = fetch --all rs1 = reset --soft HEAD~1 rs2 = reset --soft HEAD~2 rs3 = reset --soft HEAD~3 rs4 = reset --soft HEAD~4 rs5 = reset --soft HEAD~5 rs6 = reset --soft HEAD~6 rs7 = reset --soft HEAD~7 rs8 = reset --soft HEAD~8 rs9 = reset --soft HEAD~9 rh = reset --hard rh1 = reset --hard HEAD~1 rh2 = reset --hard HEAD~2 rh3 = reset --hard HEAD~3 rh4 = reset --hard HEAD~4 rh5 = reset --hard HEAD~5 rh6 = reset --hard HEAD~6 rh7 = reset --hard HEAD~7 rh8 = reset --hard HEAD~8 rh9 = reset --hard HEAD~9 df = diff --compact-summary master oc = checkout ps = push psh = push phs = push psuh = push phus = push phsu = push puhs = push push-f = push -f puhs-f = push-f push0f = push -f puhs0f = push -f add-p = add -p ds = diff --staged
also have this to pull in the lastest version of a branch from upstream
function update() { git fetch --multiple upstream origin if [ -n "$1" ] then git checkout $1 git merge remotes/upstream/$1 else git checkout master git merge remotes/upstream/master fi git push -f }