Git examples

#Make a new branch:
gco -b new_branch
#do bunch of changes
ga -A
gc -m "Made a bunch of changes"
#checkout master
gco master
#get the latest updates to master
gl
#Go back to new_branch or whatever you called it
gco new_branch
#Check diffs:
gd --stat master | cat -
#Attempt a merge (merges master into new_branch)
g merge master

#lots of merge conflicts:
g mergetool