From da88a8ca391183a001ecc2e5a65009185087d99e Mon Sep 17 00:00:00 2001
From: Steph Enders <steph@senders.io>
Date: Thu, 30 Mar 2023 12:19:14 -0400
Subject: Update gitconfig with work settings and extensions

Allow more computer specific gitconfig extensions with:

`~/.pc_local_gitconfig` this can override specific settings like email
and also setup `includeIf` blocks for specific directories
---
 .gitconfig | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index 57ad831..083687f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,17 +1,23 @@
 [alias]
-st = status -sb
-lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
-sum = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --summary
-blg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
-co = checkout
-df = diff
-cp = cherry-pick
-br = branch
+  st = status -sb
+  lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative --all
+  sum = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative master..HEAD
+  co = checkout
+  df = diff
+  cp = cherry-pick
+  br = branch
+  amend = commit --amend --no-edit
+  fix = commit --fixup 
+  autosquash = rebase -i --autosquash
+ 
 
 [core]
   excludesfile = ~/.gitignore
   autocrlf = input
 
+[init]
+  defaultBranch = main
+
 [user]
   name = Steph Enders
   email = "steph@senders.io"
@@ -23,11 +29,6 @@ br = branch
   interactive = auto
   branch = auto
 
-[filter "lfs"]
-  clean = git-lfs clean -- %f
-  smudge = git-lfs smudge -- %f
-  process = git-lfs filter-process
-  required = true
+[include]
+  path = ~/.pc_local_gitconfig
 
-[init]
-  defaultBranch=main
-- 
cgit v1.2.3-54-g00ecf