update gitconfig

2023-11-24 12:17:28 +01:00
parent 3fbcb550c5
commit 4d3fc04cd7
1 changed files with 7 additions and 0 deletions
--- a/.gitconfig
+++ b/.gitconfig
@@ -18,6 +18,13 @@
    lg = !"git lg1"
 [color]
    ui = true
+[mergetool]
+    keeptemporaries = false
+    keepbackups = false
+    prompt = false
+    trustexitcode = false
+[pull]
+    ff = true
 	
 [includeIf "gitdir/i:~/projects/github/**"]
    path = .gitconfig-github