diff options
| author | David Kaufmann <astra@ionic.at> | 2018-12-03 01:16:39 +0100 |
|---|---|---|
| committer | David Kaufmann <astra@ionic.at> | 2018-12-03 01:16:39 +0100 |
| commit | 7503e5d06645ea0d44d2940b51a31f50f23d1a50 (patch) | |
| tree | 5ec803e9e7026094141edc3b38027d9afa8c0025 /home | |
| parent | 90de6a4d65b3159eb366a9549fc3c002314495dd (diff) | |
| download | config-7503e5d06645ea0d44d2940b51a31f50f23d1a50.tar.gz | |
git: remove autosetupmerge again
Diffstat (limited to 'home')
| -rw-r--r-- | home/.gitconfig | 4 |
1 files 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 |