X-Git-Url: https://git.phdru.name/?p=dotfiles.git;a=blobdiff_plain;f=.gitconfig;h=4a411ea5a43ba005fcdb3111908a3989f7d2e440;hp=c16415a947a8760147054b0b1f3e3bbecfabbcf0;hb=6d8fcbe56b488f473406ef26c0c7a3cc2a4f0ce1;hpb=05e692f3b0ac9a58cd7755fb0b6a343085ad17c9

diff --git a/.gitconfig b/.gitconfig
index c16415a..4a411ea 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -20,7 +20,10 @@
 	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 +88,8 @@
 	untracked = red
 	updated = magenta
 
-[core]
-	pager = less -FRSXgimq
+[log]
+	abbrevCommit = true
 
 [merge]
 	tool = vimdiff