summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.config/git/config2
1 files changed, 1 insertions, 1 deletions
diff --git a/.config/git/config b/.config/git/config
index 0d57de5..453b799 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -7,7 +7,7 @@
[color]
ui = auto
[push]
- default = matching
+ default = nothing
[merge "merge-changelog"]
name = GNU-style ChangeLog merge driver
driver =git-merge-changelog %O %A %B