summary refs log tree commit diff
path: root/home/.config
diff options
context:
space:
mode:
Diffstat (limited to 'home/.config')
-rw-r--r--home/.config/X/resources2
-rw-r--r--home/.config/git/config12
2 files changed, 12 insertions, 2 deletions
diff --git a/home/.config/X/resources b/home/.config/X/resources
index cfedf60b..f4603cd9 100644
--- a/home/.config/X/resources
+++ b/home/.config/X/resources
@@ -26,7 +26,7 @@ XTerm*VT100*translations: #override \n\
 	<Btn4Down>: scroll-back(1,line,m) \n\
 	<Btn5Down>: scroll-forw(1,line,m)
 
-XTerm*faceName: Go Mono:size=11
+XTerm*faceName: Go Mono:size=12
 XTerm*internalBorder: 6
 XTerm*colorBDMode: true
 XTerm*scrollBar: false
diff --git a/home/.config/git/config b/home/.config/git/config
index ada63e41..c990de2c 100644
--- a/home/.config/git/config
+++ b/home/.config/git/config
@@ -1,16 +1,23 @@
 [user]
-	name = C. McEnroe
+	name = June McEnroe
 	email = june@causal.agency
 
+[branch]
+	sort = committerdate
+
 [commit]
 	verbose = true
 
 [diff]
 	colorMoved = default
+	colorMovedWS = allow-indentation-change
 
 [merge]
 	conflictStyle = diff3
 
+[push]
+	autoSetupRemote = true
+
 [pull]
 	rebase = true
 
@@ -20,5 +27,8 @@
 [pretty]
 	log = %Cred%h %Creset%s%C(yellow)%d %Cgreen(%ar) %Cblue<%aN>
 
+[alias]
+	forgive = blame
+
 [include]
 	path = ./private