From 7503e5d06645ea0d44d2940b51a31f50f23d1a50 Mon Sep 17 00:00:00 2001 From: David Kaufmann Date: Mon, 3 Dec 2018 01:16:39 +0100 Subject: git: remove autosetupmerge again --- home/.gitconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/home/.gitconfig b/home/.gitconfig index 1db3f65..3608066 100644 --- a/home/.gitconfig +++ b/home/.gitconfig @@ -3,7 +3,6 @@ lg = log --all --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --abbrev-commit [branch] - autosetupmerge = always autosetuprebase = always [branch "master"] @@ -32,7 +31,8 @@ rebase = preserve [push] - default = upstream + #default = upstream + default = simple [rebase] autostash = true -- cgit v1.2.3