.gitconfig: remove core.pager and pass -FRSX in env

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 67b48341f734b8633413765cad4202d4964b5afa..4a411ea5a43ba005fcdb3111908a3989f7d2e440 100644 (file)
--- 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
@@ -17,8 +18,12 @@
        lr5 = log --decorate --reverse -5
        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
@@ -83,8 +88,8 @@
        untracked = red
        updated = magenta
 
-[core]
-       pager = less -FRSXgimq
+[log]
+       abbrevCommit = true
 
 [merge]
        tool = vimdiff