tmux: reduce esc+<key> timeout

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 954a76ad484406ab36a2dcecca283b43b4394158..04367fe1f120b0eccb96824a56d02a3240f94b7d 100644 (file)
--- a/git/config
+++ b/git/config
@@ -11,6 +11,8 @@
        recurseSubmodules = check
 [diff]
        tool = vimdiff
        recurseSubmodules = check
 [diff]
        tool = vimdiff

+[diff "gpg"]
+       textconv = gpg --quiet --decrypt --use-agent

 [color "diff"]
        new = cyan bold
        old = red bold
 [color "diff"]
        new = cyan bold
        old = red bold


@@ -24,17 +26,22 @@
 [merge]
        tool = fugitive
        defaultToUpstream = true
 [merge]
        tool = fugitive
        defaultToUpstream = true

+       conflictstyle = diff3

 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true
 [mergetool]
        prompt = no
 [rebase]
        autostash = true
        autosquash = true

+       stat = true
+       updateRefs = true

 [status]
        submodulesummary = true
 [rerere]
        enabled = true
 [pull]
        rebase = interactive
 [status]
        submodulesummary = true
 [rerere]
        enabled = true
 [pull]
        rebase = interactive

+[branch]
+       autoSetupMerge = inherit

 [branch "master"]
        rebase = merges
 [branch "develop"]
 [branch "master"]
        rebase = merges
 [branch "develop"]


@@ -52,3 +59,5 @@
 
 [includeIf "gitdir:~/src/fpp/**"]
        path = ~/.config/git/fpp.config
 
 [includeIf "gitdir:~/src/fpp/**"]
        path = ~/.config/git/fpp.config

+[credential]
+       helper = cache