Let's see PGP git signatures

[dotfiles.git] / git / .gitconfig

diff --git a/git/.gitconfig b/git/.gitconfig
index 9862326e3b7dfb6e94b0096fae5ea634bfd1038c..f4045b6927877c3cfa04be90723537754dade5e0 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
@@ -18,6 +21,7 @@
        whitespace = blank-at-eol, space-before-tab, tab-in-indent, blank-at-eof
 [log]
        date = iso8601
+       showSignature = true
 [push]
        default = current
 [rebase]
@@ -28,7 +32,10 @@
        displayRef = *
 [diff]
        algorithm = patience
+       tool = vimdiff
 [grep]
        lineNumber = true
-[advice]
-    detachedHead = false
+[merge]
+       tool = vimdiff
+[pull]
+       ff = only