From 145a8cbc344d66b0e0ba582d02745ea2f5bf3564 Mon Sep 17 00:00:00 2001 From: Johannes Löthberg Date: Tue, 20 Dec 2016 19:15:45 +0100 Subject: git: Make push.default simple MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Johannes Löthberg --- git/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'git/config') 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 -- cgit v1.2.3-70-g09d2