From a7ee6a8cc5f6499f1766c9f78f4bd56d169bc680 Mon Sep 17 00:00:00 2001
From: Trysdyn Black <trysdyn@voidfox.com>
Date: Sat, 9 May 2020 00:13:19 -0700
Subject: [PATCH] Massive update to gitconfig, add VISUAL to zshrc

Most of the gitconfig stuff is stolen from other dotfile repos out
there, wherein I perused their gitconfigs, saw things that looked like
good ideas, researched what they actually did, then added them.

Of particular importance is the removal of my gitconfig [user] block
which has been moved to an included local file. This is to get around
the fact that I use this repo for work and personal stuff and don't want
a default with my legal name or online identity in it.
---
 .gitconfig | 41 +++++++++++++++++++++++++++++++++++++----
 .zshrc     |  1 +
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/.gitconfig b/.gitconfig
index 4b1ee3f..04a9c6f 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,38 @@
-[user]
-	email = trysdyn@voidfox.com
-	name = Trysdyn Black
+[apply]
+    whitespace = fix
+
+[core]
+    # Declare erroenous the same whitespace errors vim does
+    whitespace = space-before-tab,-indent-with-non-tab,trailing-space
+    editor = vim
+    whitespace = warn
+
+[diff]
+    # Detect both copies and renames in diffs
+    renames = copies
+    tool = vimdiff
+
+[difftool]
+    prompt = false
+
+[merge]
+    # Log merge activities to output
+    log = true
+    tool = vimdiff
+
+[pretty]
+    terse  = format:%C(auto,yellow)%h%C(auto,reset) %s %C(auto,green)(%cr) %C(auto,bold blue) %an %C(auto,reset)%C(auto,red)%d%C(auto,reset)
+
 [push]
-	default = simple
+    # Reinforce git 2.0 default behavior for consistency
+    default = simple
+    followTags = true
+
+[alias]
+    tlog = log --pretty=terse
+
+# A gross fix for the fact that I need two different [user] blocks depending on
+# what system I'm on. The local file will only contian [user].
+# On the plus side, lacking it should cause git to fatal so I never miss it.
+[include]
+	path = ~/.gitconfig.local
diff --git a/.zshrc b/.zshrc
index b8ca7d8..ea82a23 100644
--- a/.zshrc
+++ b/.zshrc
@@ -11,6 +11,7 @@ source ~/.p10k/powerlevel10k.zsh-theme
 
 export PATH=~/bin:$PATH
 export EDITOR=vim
+export VISUAL=$EDITOR
 export PAGER=most
 
 HISTFILE=~/.zsh_history