X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=b3e81d7b57c30205123d0c285b47ee2d2843e0ac;hb=56329756fa00ef4e8c609b898192eb188419e8d5;hp=83f1bee08ceccdc61ab4232747a6539ff210b55f;hpb=50e5d822ebe0c7bd41cafddc120ce31480494703;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 83f1bee..b3e81d7 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,46 +1,71 @@
 [alias]
 	b = branch
+	camend = commit --amend -C HEAD
 	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
+	dshow = show --decorate
+	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
+	unstage = reset HEAD --
+	wdiff = diff --word-diff
+	wshow = show --word-diff
 
-[pretty]
-	beautiful = format:%Cblue%h%Creset (%ar - %Cgreen%aN <%aE>%Creset)%n%B%n
+[branch]
+	autosetuprebase = always
 
 [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 = red
+#	remote = magenta
 #	-- light bg --
 	current = blue
+	local = normal
+	plain = normal
 	remote = magenta
+	upstream = normal
 [color "diff"]
 #	-- default --
-#	commit = yellow
+#	commit = bold yellow
 #	frag = cyan
-#	meta = bold
+#	meta = cyan
 #	new = green
-#	old = red
+#	old = magenta
 #	plain = normal
 #	whitespace = normal red
 #	-- light bg --
 	commit = normal bold
-	frag = green
+	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
@@ -49,8 +74,8 @@
 #	prompt = normal
 [color "status"]
 #	-- default --
-#	added = red
-#	changed = red
+#	added = cyan
+#	changed = magenta
 #	header = normal
 #	nobranch = red
 #	untracked = red
@@ -58,11 +83,17 @@
 #	-- light bg --
 	added = blue
 	changed = blue
+	header = normal
+	nobranch = red
+	untracked = red
 	updated = magenta
 
 [core]
 	pager = less -FRSXgimq
 
+[log]
+	abbrevCommit = true
+
 [merge]
 	tool = vimdiff