From ec428bc05f8a1ff81b60a38919958dfedbab2d7b Mon Sep 17 00:00:00 2001
From: esteban_ba <ebaguirre@citykinect.com>
Date: Thu, 4 Sep 2025 16:10:51 -0700
Subject: [PATCH 1/2] Create git config file under `~/.config`

This will help to keep our git config alongside our other configuration
files instead of in the home directory under `~/.gitconfig`
---
 install/config/git.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/install/config/git.sh b/install/config/git.sh
index 54bb4bd..84e5bb6 100755
--- a/install/config/git.sh
+++ b/install/config/git.sh
@@ -1,5 +1,12 @@
 #!/bin/bash
 
+# Create git config file under .config if it doesn't exist
+# This helps to keep all our configs in one place
+if [[ ! -f "~/.config/git/config" ]]; then
+  mkdir -p "~/.config/git"
+  touch "~/.config/git/config"
+fi
+
 # Set common git aliases
 git config --global alias.co checkout
 git config --global alias.br branch

From 8088effe9fee0d6db1b5eef21279d80adb40f987 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@hey.com>
Date: Sun, 7 Sep 2025 20:35:29 +0200
Subject: [PATCH 2/2] Update git.sh

---
 install/config/git.sh | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/install/config/git.sh b/install/config/git.sh
index 84e5bb6..4864a29 100755
--- a/install/config/git.sh
+++ b/install/config/git.sh
@@ -1,11 +1,8 @@
 #!/bin/bash
 
-# Create git config file under .config if it doesn't exist
-# This helps to keep all our configs in one place
-if [[ ! -f "~/.config/git/config" ]]; then
-  mkdir -p "~/.config/git"
-  touch "~/.config/git/config"
-fi
+# Ensure git settings live under ~/.config
+mkdir -p ~/.config/git
+touch ~/.config/git/config
 
 # Set common git aliases
 git config --global alias.co checkout