From 893eff8eec7996ee531da204d9f0d62ac91d5882 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Fri, 18 Jul 2025 11:45:22 -0400 Subject: [PATCH] Add git configuration for branch.autoSetupMerge --- bash_aliases.d/git | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bash_aliases.d/git b/bash_aliases.d/git index 9d16dd1..41064b4 100644 --- a/bash_aliases.d/git +++ b/bash_aliases.d/git @@ -28,6 +28,9 @@ function git-config-joshs() git config --global init.defaultBranch master # Only use configured user.name/user.email; do not guess them git config --global user.useConfigOnly true + # Do not automatically mark my branch as tracking the remote branch that I + # happened to use as the starting point. + git config --global branch.autoSetupMerge false } function git-config-local-personal() {