index
:
rice
archlinux
debian
raspberrypi
Just enough rice
malf
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
diff options
context:
1
2
3
4
5
6
7
8
9
10
15
20
25
30
35
40
space:
include
ignore
mode:
unified
ssdiff
stat only
Diffstat
-rw-r--r--
.gitconfig
2
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitconfig b/.gitconfig
index e2b9a3b..9792355 100644
--- a/
.gitconfig
+++ b/
.gitconfig
@@ -32,6 +32,8 @@
[merge]
log = true
tool = vimdiff
+[mergetool]
+ keepBackup = false
[push]
autoSetupRemote = true
default = current