From 8813a2f46f474a2b04bdc126911bba5c0c707c0a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 15 Jun 2020 19:36:35 +0000
Subject: modules/git: set some cool looking config options

I just read all the way through git-config(1).  These options looked
neat.  I haven't tried them yet.  Maybe I'll end up hating some of
them.  Who knows.
---
 modules/shell/git/config.in | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

(limited to 'modules/shell')

diff --git a/modules/shell/git/config.in b/modules/shell/git/config.in
index d066f2f5cfbf..8113962e0c9e 100644
--- a/modules/shell/git/config.in
+++ b/modules/shell/git/config.in
@@ -1,6 +1,9 @@
 [alias]
     ignore = "!gi() { curl -L -s https://www.gitignore.io/api/$@ ;}; gi"
     unbranch = "!git branch --sort -HEAD --merged | sed 1d | xargs git branch -d"
+[am]
+    messageid = true
+    threeWay = true
 [branch]
     autosetuprebase = always
 [color "branch"]
@@ -25,11 +28,17 @@
 [credential]
     helper = osxkeychain
 [diff]
+    algorithm = histogram
     compactionHeuristic = true
+    mnemonicPrefix = true
     renameLimit = 0
+    renames = copy
+    submodule = diff
     wsErrorHighlight = all
 [diff "mozlz4"]
     textconv = @mozlz4_textconv@
+[fetch]
+    parallel = 0
 [filter "lfs"]
     clean = git-lfs clean -- %f
     required = true
@@ -37,6 +46,7 @@
 [format]
     pretty = format:%Cred%h %C(magenta)%G? %Cgreen(%ar)%Creset -%C(bold red)%d%Creset %s %C(bold blue)<%aN>%Creset
 [grep]
+    fallbackToNoIndex = true
     lineNumber = true
     patternType = perl
 [help]
@@ -48,5 +58,14 @@
     tool = opendiff
 [push]
     default = upstream
+[rebase]
+    autoSquash = true
+    autoStash = true
+    rescheduleFailedExec = true
+    stat = true
 [sendemail]
-    confirm = always
\ No newline at end of file
+    confirm = always
+[stash]
+    showPatch = true
+[submodule]
+    fetchJobs = 0
-- 
cgit 1.4.1