X-Git-Url: https://git.phdru.name/?a=blobdiff_plain;f=.gitconfig;h=17c893cb8649d011724a991c10eedfdf20e45625;hb=3feb230e5fad6fe3b98899795864e81995ce8692;hp=c16415a947a8760147054b0b1f3e3bbecfabbcf0;hpb=05e692f3b0ac9a58cd7755fb0b6a343085ad17c9;p=dotfiles.git

diff --git a/.gitconfig b/.gitconfig
index c16415a..17c893c 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,11 +16,16 @@
 	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
@@ -85,8 +90,8 @@
 	untracked = red
 	updated = magenta
 
-[core]
-	pager = less -FRSXgimq
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff