X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=a26c359a7ec454d89500c29620651063d3cc37c2;hb=fbeba601647c48dc0f59af8eac2c50f1acc10ff7;hp=701610db32b76078193d0c5241965cef3b2cfb0e;hpb=27a2d72e733a2473bb7a0e456fed63debf61d290;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 701610d..a26c359 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -5,13 +5,80 @@
 	co = checkout
 	l1 = log --oneline
 	l5 = log -5
-	lb = log --decorate --graph --stat --pretty=beautiful
-	lb5 = log --decorate --graph --stat --pretty=beautiful -5
-	st = status -s
+	lb = log --decorate --graph --pretty=beautiful --stat
+	lb5 = log --decorate --graph --pretty=beautiful --stat -5
+	lg = log --decorate --graph
+	lg1 = log --decorate --graph --oneline
+	lg5 = log --decorate --graph -5
+	st = status --short
+	stb = status --short --branch
 
 [pretty]
 	beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
 
+[color]
+	ui = auto
+
+# Adapted from http://shallowsky.com/blog/programming/gitcolors.html
+# and http://www.ansdb.com/649-git-colors-for-light-background
+[color "branch"]
+#	-- default --
+#	current = green
+#	local = normal
+#	plain = normal
+#	remote = magenta
+#	-- light bg --
+	current = blue
+	local = normal
+	plain = normal
+	remote = magenta
+	upstream = normal
+[color "diff"]
+#	-- default --
+#	commit = bold yellow
+#	frag = cyan
+#	meta = cyan
+#	new = green
+#	old = magenta
+#	plain = normal
+#	whitespace = normal red
+#	-- light bg --
+	commit = normal bold
+	frag = cyan
+	meta = bold
+	new = blue
+	old = magenta
+	plain = normal
+	whitespace = normal red
+#[color "grep"]
+#	-- default --
+#	match = normal
+[color "decorate"]
+#	-- light bg --
+	HEAD = blue
+	tag = blue
+#[color "interactive"]
+#	-- default --
+#	error = normal
+#	header = normal
+#	help = normal
+#	prompt = normal
+[color "status"]
+#	-- default --
+#	added = cyan
+#	changed = magenta
+#	header = normal
+#	nobranch = red
+#	untracked = red
+#	updated = green
+#	-- light bg --
+	added = blue
+	changed = blue
+	header = normal
+	nobranch = red
+	untracked = red
+	updated = magenta
+
 [core]
 	pager = less -FRSXgimq