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

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 58ff46495493aed27d9690d83606d934dfd3e5e3..4a411ea5a43ba005fcdb3111908a3989f7d2e440 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,12 +1,12 @@
 [alias]
        b = branch
-       ca = commit --amend
        camend = commit --amend -C HEAD
        checkin = commit
        ci = commit
        co = checkout
        d = diff
        dc = diff --cached
+       dshow = show --decorate
        l = log --decorate
        l1 = log --decorate --oneline
        l5 = log --decorate -5
@@ -18,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
@@ -84,8 +88,8 @@
        untracked = red
        updated = magenta
 
-[core]
-       pager = less -FRSXgimq
+[log]
+       abbrevCommit = true
 
 [merge]
        tool = vimdiff