aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/home
diff options
context:
space:
mode:
authorLibravatar sommerfeld <sommerfeld@sommerfeld.dev>2025-01-31 17:32:26 +0000
committerLibravatar sommerfeld <sommerfeld@sommerfeld.dev>2025-01-31 17:56:06 +0000
commit107627ef134e9e9da32ddfb73538459364772912 (patch)
treeaedfa57947ab208d97ea433a5a86ef9beba710b5 /home
parentc5a9991c36e4dcbe438e5e7c255220fc5f87452f (diff)
downloaddotfiles-107627ef134e9e9da32ddfb73538459364772912.tar.gz
dotfiles-107627ef134e9e9da32ddfb73538459364772912.tar.bz2
dotfiles-107627ef134e9e9da32ddfb73538459364772912.zip
Set git's mergeTool.keepTemporaries=false
Diffstat (limited to 'home')
-rw-r--r--home/.config/git/config2
1 files changed, 2 insertions, 0 deletions
diff --git a/home/.config/git/config b/home/.config/git/config
index 46b34c2..0ead8e7 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -43,6 +43,8 @@
[merge "mergiraf"]
name = mergiraf
driver = mergiraf merge --git %O %A %B -s %S -x %X -y %Y -p %P
+[mergetool]
+ keepTemporaries = false
[mergetool "conflictmarker"]
cmd = $EDITOR "$MERGED"
[commit]