From 5bae9bc66e3b9c02c1f72cdad47a529c44c2dd30 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Wed, 4 Jun 2025 08:05:34 -0400
Subject: [PATCH 1/2] Add bash_profile, profile

---
 bash_profile  | 2 ++
 install-files | 3 +++
 profile       | 2 ++
 3 files changed, 7 insertions(+)
 create mode 100644 bash_profile
 create mode 100644 profile

diff --git a/bash_profile b/bash_profile
new file mode 100644
index 0000000..a825e1b
--- /dev/null
+++ b/bash_profile
@@ -0,0 +1,2 @@
+source $HOME/.profile
+source $HOME/.bashrc
diff --git a/install-files b/install-files
index 5fdd972..6db17d1 100755
--- a/install-files
+++ b/install-files
@@ -21,6 +21,9 @@ def install_file(src, dst):
 
 files = [
         ('bash_aliases', '.bash_aliases'),
+        ('bash_aliases.d', '.bash_aliases.d'),
+        ('bash_profile', '.bash_profile'),
+        ('profile', '.profile'),
         ('inputrc', '.inputrc'),
         ('screenrc', '.screenrc'),
         ('gitignore', '.gitignore'),
diff --git a/profile b/profile
new file mode 100644
index 0000000..57c89eb
--- /dev/null
+++ b/profile
@@ -0,0 +1,2 @@
+export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket"
+export PATH="$HOME/bin":"$PATH"

From 893eff8eec7996ee531da204d9f0d62ac91d5882 Mon Sep 17 00:00:00 2001
From: Josh Holtrop <jholtrop@gmail.com>
Date: Fri, 18 Jul 2025 11:45:22 -0400
Subject: [PATCH 2/2] 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()
 {