index
:
dotfiles
master
theos
.config
Johannes Löthberg
about
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--
git/config
2
1 files changed, 1 insertions, 1 deletions
diff --git a/git/config b/git/config
index 377652b..db8593c 100644
--- a/
git/config
+++ b/
git/config
@@ -94,7 +94,7 @@
conflictStyle = diff3
[push]
- default = current
+ default = simple
[repack]
writebitmaps = true