.gitconfig: Set diff.indentHeuristic

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 3860cb2642e7a43b2d54f5fbce970849c50610c0..23674acce639cbf67b5cdce60bab147704393387 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -148,6 +148,8 @@
        dump = cat-file -p
        file = cat-file -t
        type = cat-file -t
+       ff = merge --ff-only
+       git = !git
        l1 = log --decorate --oneline
        l5 = log --decorate -5
        ld = log --decorate
@@ -166,6 +168,7 @@
        remotes = remote --verbose
        #root = !exec pwd
        root = rev-parse --show-toplevel
+       status = status --no-short
        st = status --short
        stb = status --short --branch
        sd = show --decorate
@@ -178,6 +181,9 @@
 [color]
        ui = auto
 
+[diff]
+       indentHeuristic = true
+
 [include]
        path = ~/lib/config/git/light_bg