.fvwmrc: add terminals pushed to bottom-left

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index c16415a947a8760147054b0b1f3e3bbecfabbcf0..d5535a102d2c0301c94cfb601bf39b770bcbd437 100644 (file)
--- 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
@@ -88,6 +91,9 @@
 [core]
        pager = less -FRSXgimq
 
+[log]
+       abbrevCommit = true
+
 [merge]
        tool = vimdiff