update .gitconfig

Add .gitconfig aliases for 'accept ours' / 'accept theirs' functionality.
This is useful when you trying to merge branches and have conflicts.
More info: http://stackoverflow.com/questions/914939