josh/files
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add git configuration for branch.autoSetupMerge

Browse Source
This commit is contained in:
Josh Holtrop 2025-07-18 11:45:22 -04:00
parent 5bae9bc66e
commit 893eff8eec
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bash_aliases.d/git
View File

@ -28,6 +28,9 @@ function git-config-joshs()
git config --global init.defaultBranch master git config --global init.defaultBranch master
# Only use configured user.name/user.email; do not guess them # Only use configured user.name/user.email; do not guess them
git config --global user.useConfigOnly true 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() function git-config-local-personal()
{ {