From 14cd2414cd08c913aa4fcf38f305eab9810b8611 Mon Sep 17 00:00:00 2001
From: srdusr <trevorgray@srdusr.com>
Date: Thu, 19 Oct 2023 23:16:14 +0200
Subject: Testing new aliases

---
 .gitconfig | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 63bb941..a5555dc 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,8 +1,12 @@
 [user]
 	name = srdusr
-	email = graytrevor98@gmail.com
+	email = trevorgray@srdusr.com
 [init]
 	defaultBranch = main
-[alias]   
-  sba ="!f() { git subtree add --prefix $2 $1 main; }; f"  
-  sbu ="!f() { git subtree pull --prefix $2 $1 main; }; f"  
+[alias]
+    sba ="!f() { git subtree add --prefix $2 $1 main; }; f"
+    sbu ="!f() { git subtree pull --prefix $2 $1 main; }; f"
+    stashrebase = "!f() { if [ \"$(git symbolic-ref --short HEAD)\" = \"main\" ]; then git stash save && git fetch && git rebase origin main && git stash apply; else git stash save && git fetch && git rebase origin master && git stash apply; fi; }; f"
+    dotfiles = "!f() { git --git-dir=$HOME/.cfg --work-tree=$HOME stashrebase; }; f"
+
+
-- 
cgit v1.2.3