X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=afedc4ff177e17cf95bbfca51d07cb49745d161c;hb=74cdaa6950c76462a6fa31e981985d8ee2cdd6ef;hp=cd86ef36705e6613436c74fb49d89a1f75b91423;hpb=ad68d4cd34f1114257c53e3354c2de01ef26b518;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index cd86ef3..afedc4f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,16 +1,88 @@
 [alias]
+	amend = commit --amend -C HEAD
 	b = branch
+	ca = commit --amend
 	checkin = commit
 	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 -s
+	d = diff
+	dc = diff --cached
+	l = log --decorate
+	l1 = log --decorate --oneline
+	l5 = log --decorate -5
+	lg = log --decorate --graph
+	lg1 = log --decorate --graph --oneline
+	lg5 = log --decorate --graph -5
+	lr = log --decorate --reverse
+	lr1 = log --decorate --reverse --oneline
+	lr5 = log --decorate --reverse -5
+	st = status --short
+	stb = status --short --branch
+	wdiff = diff --word-diff
+	wshow = show --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 +95,9 @@
 # 3 way diffs
 #	cmd = vim -d \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\" -c \"wincmd J\"
 
+[receive]
+	denyNonFastForwards = true
+
 [web]
 	browser = webbrowser