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.
master
Jordan Atwood 2 years ago
parent e8c7f07a32
commit 5fb87a162e
Signed by: nightfirecat
GPG Key ID: 615A619C2D73A6DF
  1. 3
      src/.gitconfig

@ -27,9 +27,6 @@
sur = submodule update --recursive
[apply]
whitespace = fix
[branch]
autosetupmerge = always
autosetuprebase = always
[color]
branch = auto
diff = auto

Loading…
Cancel
Save