X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=d6a5853a1836268a6d374b70a275d41ca9ca7c61;hb=cc3973ec26b36ef37e1737d276bc6568bbaf19de;hp=4afa96f5abf39ad57581b71e76c6bad9061e4397;hpb=d8163925c870f7b2c176d0c3d00e945cf05bac16;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 4afa96f..d6a5853 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -7,10 +7,77 @@
 	l5 = log -5
 	lb = log --decorate --graph --stat --pretty=beautiful
 	lb5 = log --decorate --graph --stat --pretty=beautiful -5
-	st = status
+	lg = log --decorate --graph
+	lg1 = log --decorate --graph --oneline
+	lg5 = log --decorate --graph -5
+	st = status -s
+	stb = status -sb
 
 [pretty]
-	beautiful = format:'%C(blue)%h%Creset (%ar - %C(green)%aN <%aE>%C(reset))%n%B%n'
+	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
@@ -23,6 +90,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser