From cc90f63b64f5f44ee650b96cd51345bf17ad3936 Mon Sep 17 00:00:00 2001
From: Erin <git@ewin.moe>
Date: Wed, 16 Nov 2022 21:52:10 -0500
Subject: [PATCH] git: move personal config to separate file

Stuff like credential stores (which are different by platform) tend to clutter the main file, so I'm shoving them in their own file which won't be touched by automated setup tools
---
 git/.config/git/personal.gitconfig | 23 +++++++++++++++++++++++
 git/.gitconfig                     | 18 ++----------------
 2 files changed, 25 insertions(+), 16 deletions(-)
 create mode 100644 git/.config/git/personal.gitconfig

diff --git a/git/.config/git/personal.gitconfig b/git/.config/git/personal.gitconfig
new file mode 100644
index 0000000..1967596
--- /dev/null
+++ b/git/.config/git/personal.gitconfig
@@ -0,0 +1,23 @@
+# User identity
+[user]
+	name = Erin
+	email = github@eritbh.me
+
+# Command aliases
+[alias]
+	l = log --oneline --decorate --graph
+	la = log --oneline --decorate --graph --all
+	wmerge = merge --no-commit -Xignore-space-change
+	lc = diff --numstat
+	pushup = push --set-upstream origin @
+	s = stash save --include-untracked
+	sp = stash pop
+	sl = stash list
+
+# Rebase local commits on top of remote commits when running `git pull`
+[pull]
+	rebase = true
+
+# New repos have a default branch name of "main"
+[init]
+	defaultBranch = main
diff --git a/git/.gitconfig b/git/.gitconfig
index 2cef279..6135354 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -1,16 +1,2 @@
-[user]
-	name = Erin
-	email = github@eritbh.me
-[alias]
-	l = log --oneline --decorate --graph
-	la = log --oneline --decorate --graph --all
-	wmerge = merge --no-commit -Xignore-space-change
-	lc = diff --numstat
-	pushup = push --set-upstream origin @
-	s = stash save --include-untracked
-	sp = stash pop
-	sl = stash list
-[pull]
-	rebase = true
-[init]
-	defaultBranch = main
+[include]
+	path = ~/.config/git/personal.gitconfig