My git config

There are a few things I always put in my .gitconfig and I recommend them to everyone who uses git.

[merge]
	conflictstyle = diff3

I am angry that diff3 is not the default. How can anyone resolve a conflict when you can't see the common ancestor, honestly. See stackoverflow for more explanation.

[alias]
	lg  = log --graph --oneline --decorate --color
	lga = log --graph --oneline --decorate --color --all

These aliases give you a quick Log Graph in the terminal, so you can see branching and merging and figure out where you are. If you want to get fancy about it you can add this to show a time and author on each commit:

--pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(blue)<%an>%Creset'