X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=14b5b731bbf64bf50f75929c11dff77a3cfec89b;hb=e03dd11d8c4469a0f510d2a046442d504474cfc7;hp=335be8ee5f980bc57b62db59f45cd131b6c2371a;hpb=8ec2cd351957cd95c7ee6e866da9a828b15d4b73;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 335be8e..14b5b73 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,16 +1,81 @@
 [alias]
+	amend = commit --amend -C HEAD
 	b = branch
 	checkin = commit
+	ca = commit --amend
 	ci = commit
 	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
+	d = diff
+	dc = diff --cached
+	lg = log --decorate --graph
+	lg1 = log --decorate --graph --oneline
+	lg5 = log --decorate --graph -5
+	st = status --short
+	stb = status --short --branch
+	wdiff = diff --word-diff
 
-[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
@@ -23,6 +88,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser