From d5faf831b5f3b9151ae67034c7df67d4fc5fa272 Mon Sep 17 00:00:00 2001
From: ViViDboarder <ViViDboarder@gmail.com>
Date: Wed, 28 Sep 2022 11:29:34 -0700
Subject: [PATCH] Update gitconfigs ff rules and path inclusions

Add git config for path based inclusion of user specific configs
---
 assets/default/git/user_vividboarder.inc |  5 +++++
 recipes/default/git                      | 15 +++++++++++----
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 assets/default/git/user_vividboarder.inc

diff --git a/assets/default/git/user_vividboarder.inc b/assets/default/git/user_vividboarder.inc
new file mode 100644
index 0000000..6f64809
--- /dev/null
+++ b/assets/default/git/user_vividboarder.inc
@@ -0,0 +1,5 @@
+[user]
+    name = ViViDboarder
+    email = ViViDboarder@gmail.com
+
+# vim: filetype=gitconfig
diff --git a/recipes/default/git b/recipes/default/git
index 2341c07..e730ae9 100755
--- a/recipes/default/git
+++ b/recipes/default/git
@@ -1,15 +1,22 @@
 #! /bin/bash
 
-# Set some Git Config options
 # Set vim as default git editor
-git config --global core.editor "vim"
+git config --global core.editor vim
 # Turn on colors
 git config --global color.ui auto
 # Set diff tool to vimdiff
 git config --global diff.tool vimdiff
 # Suppress launching prompt
 git config --global difftool.prompt false
+# Make main my default branch
+git config --global init.defaultBranch main
+# Set pull behavior
+git config --global pull.ff only
+
 # Create global ignore file
-mkdir -p "$XDG_CONFIG_HOME/git/"
-git config --global core.excludesfile "$XDG_CONFIG_HOME/git/exclude_global"
 try_link "exclude_global" "$XDG_CONFIG_HOME/git/exclude_global"
+git config --global core.excludesfile "$XDG_CONFIG_HOME/git/exclude_global"
+
+# Add some includes
+try_link "user_vividboarder.inc" "$XDG_CONFIG_HOME/git/user_vividboarder.inc"
+git config --global includeif.gitdir:~/workspace/vividboarder/.path "$XDG_CONFIG_HOME/git/user_vividboarder.inc"