summaryrefslogtreecommitdiff
path: root/gitconfig
diff options
context:
space:
mode:
authorXian Wang <dev@xianwang.io>2025-11-10 12:34:00 -0800
committerXian Wang <dev@xianwang.io>2025-11-10 12:34:00 -0800
commitbc9d1daa29df885c8cc8631383bc8da5e85cbb2d (patch)
tree7286dc655e707ad9afe0df9d68b94adba752f330 /gitconfig
parent52cc55349532d409919079a5153ef6aad699004d (diff)
downloaddotfiles-bc9d1daa29df885c8cc8631383bc8da5e85cbb2d.tar.gz
dotfiles-bc9d1daa29df885c8cc8631383bc8da5e85cbb2d.tar.bz2
dotfiles-bc9d1daa29df885c8cc8631383bc8da5e85cbb2d.zip
gitconfig: make mergetool stop keeping backups
Signed-off-by: Xian Wang <dev@xianwang.io>
Diffstat (limited to 'gitconfig')
-rw-r--r--gitconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/gitconfig b/gitconfig
index 09d3d34..ec84dae 100644
--- a/gitconfig
+++ b/gitconfig
@@ -7,3 +7,5 @@
tool = meld
[rerere]
enabled = true
+[mergetool]
+ keepBackup = false