From 26cdd6b0af6da196f879cff6648e99658f44b3cc Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Tue, 27 May 2014 22:53:28 +0300 Subject: [PATCH] gitconfig: remove branch.autosetupmerge It really isn't what I wanted, far from it. --- .gitconfig.MKAYSIGREP | 2 -- gitconfig | 2 -- 2 files changed, 4 deletions(-) diff --git a/.gitconfig.MKAYSIGREP b/.gitconfig.MKAYSIGREP index 41b5e82c..0be9133d 100644 --- a/.gitconfig.MKAYSIGREP +++ b/.gitconfig.MKAYSIGREP @@ -21,5 +21,3 @@ signingkey = 0xDAA6CA08F2E96AC7 [push] default = current -[branch] - autosetupmerge = always diff --git a/gitconfig b/gitconfig index ab98ff10..7c8f92ad 100644 --- a/gitconfig +++ b/gitconfig @@ -21,5 +21,3 @@ #signingkey = 0xDAA6CA08F2E96AC7 [push] default = current -[branch] - autosetupmerge = always