From 7ba608be5db37e5cbda4930e2c10783e4c0f9b9d Mon Sep 17 00:00:00 2001 From: Price Hiller Date: Tue, 18 Oct 2022 18:44:55 -0500 Subject: [PATCH] feat(git): automatically set upstream branches --- dots/.gitconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dots/.gitconfig b/dots/.gitconfig index 5e77ada8..114eb7af 100644 --- a/dots/.gitconfig +++ b/dots/.gitconfig @@ -46,5 +46,10 @@ unstage = reset HEAD -- [push] autoSetupRemote = true + default = current [merge] conflictstyle = diff3 +[branch] + autosetupmerge = always +[remote] + pushDefault = origin