Merge branch 'master' of tinoc:nivertius/git-rc

.gitconfig

@@ -1,6 +1,17 @@
 [user]
 	name = Paweł Płazieński
 	email = nivertius@gmail.com
+[color]
+	branch = auto
+	ui = auto
+	diff = auto
+	grep = auto
+	interactive = auto
+	showBranch = auto
+	status = auto
+[core]
+	excludesFile = ~/.gitignore_global
+	whitespace = trailing-space space-before-tab
 [push]
 	default = simple
 [alias]
@@ -10,6 +21,7 @@
 	di = diff
 	co = checkout
 	dit = difftool --dir-diff
+	lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)' --all
 [core]
 	editor = vim
 [diff]

.gitignore_global

@@ -0,0 +1,3 @@
+*~
+*.pyc
+