From 5fb87a162e1dc75622249dbb96fa5743ca58eb94 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Sat, 3 Sep 2022 22:42:57 -0700 Subject: [PATCH] Remove autosetupmerge and autosetuprebase While these configs are useful in the event that I want to `git pull` on feature branches and have them update from their source branch, I find that in practice I rarely use this workflow. I generally only pull on branches which track a remote branch directly, and I normally reach for `git rebase` when updating feature branches from their source. These configurations also interfere with my workflow of `git push` creating the branch in my origin if absent. --- src/.gitconfig | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/.gitconfig b/src/.gitconfig index 480165f..201b3b6 100644 --- a/src/.gitconfig +++ b/src/.gitconfig @@ -27,9 +27,6 @@ sur = submodule update --recursive [apply] whitespace = fix -[branch] - autosetupmerge = always - autosetuprebase = always [color] branch = auto diff = auto