Let's remember about vimdiff in git

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 4f5a87a5d56b0431528fc2ec5062306ea0cc3425..c5eff0d930a8b7ffa71db3a193e79fc642660991 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,3 +1,6 @@
+[advice]
+       pushUpdateRejected = false
+       detachedHead = false
 [alias]
        wt = worktree
        unchanged = update-index --assume-unchanged
@@ -28,5 +31,8 @@
        displayRef = *
 [diff]
        algorithm = patience
+       tool = vimdiff
 [grep]
        lineNumber = true
+[merge]
+       tool = vimdiff