X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=598af7be712d6828a716ab612e6cf2cf2c106bdd;hb=a14de628225121a518b4ffc10de5f8be45d97e30;hp=67b48341f734b8633413765cad4202d4964b5afa;hpb=6ec44eee122dd7ab47d802b3e7db69ae695687cc;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index 67b4834..598af7b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -6,6 +6,7 @@
 	co = checkout
 	d = diff
 	dc = diff --cached
+	dshow = show --decorate
 	l = log --decorate
 	l1 = log --decorate --oneline
 	l5 = log --decorate -5
@@ -15,76 +16,25 @@
 	lr = log --decorate --reverse
 	lr1 = log --decorate --reverse --oneline
 	lr5 = log --decorate --reverse -5
+	root = rev-parse --show-toplevel
+	#root = !pwd
 	st = status --short
 	stb = status --short --branch
+	unstage = reset HEAD --
 	wdiff = diff --word-diff
-	wshow = show --word-diff
+	wshow = show --word-diff --decorate
+
+[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 = 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
+[include]
+	path = ~/lib/config/git/light_bg
 
-[core]
-	pager = less -FRSXgimq
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff