gitconfig: remove branch.autosetupmerge

It really isn't what I wanted, far from it.
2014-05-27 22:53:28 +03:00 · 2014-05-27 22:53:28 +03:00 · 26cdd6b0af
parent 14c7faadfd
commit 26cdd6b0af
2 changed files with 0 additions and 4 deletions
--- a/.gitconfig.MKAYSIGREP
+++ b/.gitconfig.MKAYSIGREP
@ -21,5 +21,3 @@
 	signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
-[branch]
-	autosetupmerge = always
--- a/2
+++ b/2
@ -21,5 +21,3 @@
 	#signingkey = 0xDAA6CA08F2E96AC7
 [push]
 	default = current
-[branch]
-	autosetupmerge = always