nvim: replace Util.telescope with LazyVim.pick

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 8f78436ffe94d24443dc3ba9116c24065f96208e..579f4c07b2949df1921676821b56a1c0b9635654 100644 (file)
--- a/git/config
+++ b/git/config
@@ -33,12 +33,16 @@
        autostash = true
        autosquash = true
        stat = true
        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
+       sort = -committerdate

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