.gitconfig: Set push.recurseSubmodules = check

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index c7383fe3550dba5522157ae3f2139c94f40afa15..cf38da967205738bc644e0bf669b8a5f71b5e521 100644 (file)
--- a/.gitconfig
+++ b/.gitconfig
@@ -144,9 +144,12 @@
        checkin = commit
        ci = commit
        cat = cat-file -p
+       dir = rev-parse --git-dir
        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
@@ -165,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
@@ -177,11 +181,18 @@
 [color]
        ui = auto
 
+[diff]
+       indentHeuristic = true
+
+[grep]
+       fallbackToNoIndex = true
+
 [include]
        path = ~/lib/config/git/light_bg
 
 [log]
        abbrevCommit = true
+       #mailmap = true
 
 [merge]
        tool = vimdiff
@@ -193,6 +204,8 @@
 
 [push]
        default = simple
+       followTags = true
+       recurseSubmodules = check
 
 [receive]
        denyNonFastForwards = true