.gitconfig: Add transfer.fsckObjects but not enable it

[dotfiles.git] / .gitconfig

diff --git a/.gitconfig b/.gitconfig
index 0581c556b3b00165fe4ccc8f6f969e2a3c94f4c1..fadf841ad54e7490ca76f1b86f7f81fbc499e241 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,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
@@ -194,10 +204,18 @@
 
 [push]
        default = simple
+       followTags = true
+       recurseSubmodules = check
 
 [receive]
+       #denyCurrentBranch = updateInstead
+       denyDeleteCurrent = true
+       #denyDeletes = true
        denyNonFastForwards = true
 
+#[transfer]
+#      fsckObjects = true
+
 [web]
        browser = webbrowser