aboutsummaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
Diffstat (limited to 'git')
-rw-r--r--git/config2
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