git: add extra configs

https://jvns.ca/blog/2024/02/16/popular-git-config-options/

1 files changed, 14 insertions, 1 deletions

diff --git a/.local/bin/confgit.sh b/.local/bin/confgit.sh
index d34f81e..ce7fccd 100755
--- a/.local/bin/confgit.sh
+++ b/.local/bin/confgit.sh
@@ -36,13 +36,17 @@ git --git-dir=$HOME/.dotfiles/ --work-tree=$HOME config status.showUntrackedFile
 
 # Main Git Config
 git config --global am.messageid true
+git config --global branch.sort -committerdate
 git config --global checkout.defaultRemote origin # Default to using the "origin" remote
 git config --global checkout.thresholdForParallelism 50 # Default 100 files
 git config --global checkout.workers "$NPROCS" # Auto-detect threads from CPU
+git config --global commit.verbose true
 git config --global core.commitgraph true
 git config --global core.excludesfile "$HOME/.local/share/git/ignore_global"
 git config --global credential.https://source.developers.google.com.helper "gcloud.sh"
 git config --global fetch.parallel "$NPROCS"
+git config --global fetch.prune true
+git config --global fetch.prunetags true
 git config --global fetch.writeCommitGraph true
 #git config --global fetch.writeCommitGraphs true
 git config --global gc.cruftPacks true
@@ -52,6 +56,8 @@ git config --global http.cookiefile "$HOME/.local/share/git/cookies"
 git config --global init.defaultBranch trunk
 git config --global index.recordEndOfIndexEntries true
 git config --global index.recordOffsetTable true
+git config --global log.date iso
+git config --global merge.conflictstyle diff3
 git config --global pack.threads "$NPROCS" # Auto-detect threads from CPU
 git config --global pack.useBitmapBoundaryTraversal true
 git config --global pack.writeReverseIndex true
@@ -59,12 +65,19 @@ git config --global protocol.version 2
 git config --global pull.ff only
 git config --global pull.twohead ort # Use new faster merge algorithm
 git config --global push.default simple
-git config --global push.followTags true
+#git config --global push.followTags true
+git config --global rerere.enabled true
 git config --global rebase.autoStash true
 git config --global status.submodulesummary 1
+git config --global tag.sort taggerdate
 git config --global user.email tyler@gluecode.net
 git config --global user.name "Tyler Davis"
 
+# Eagerly detect errors
+git config --global transfer.fsckobjects true
+git config --global fetch.fsckobjects true
+git config --global receive.fsckObjects true
+
 # Adding signoff for kernel and other work
 git config --global format.signoff true