vim/fugitive: winfixheight FugitiveIndex window

[dotfiles.git] / git / config

diff --git a/git/config b/git/config
index 266b57905f2763c2690960b4e7f9f0f46007c085..926e1fb44a884abd7ad5eef19b2825c4d0869d82 100644 (file)
--- a/git/config
+++ b/git/config
@@ -24,11 +24,13 @@
 [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

 [status]
        submodulesummary = true
 [rerere]
 [status]
        submodulesummary = true
 [rerere]


@@ -36,9 +38,9 @@
 [pull]
        rebase = interactive
 [branch "master"]
 [pull]
        rebase = interactive
 [branch "master"]

-       rebase = preserve
+       rebase = merges

 [branch "develop"]
 [branch "develop"]

-       rebase = preserve
+       rebase = merges

 [commit]
        verbose = true
 [alias]
 [commit]
        verbose = true
 [alias]


@@ -49,3 +51,6 @@
        smudge = git-lfs smudge -- %f
        process = git-lfs filter-process
        required = true
        smudge = git-lfs smudge -- %f
        process = git-lfs filter-process
        required = true

+
+[includeIf "gitdir:~/src/fpp/**"]
+       path = ~/.config/git/fpp.config