From 3eb79e72be3c0e5eeeaf7a2aa28bc8cb450eabcf Mon Sep 17 00:00:00 2001
From: Matt Singleton <matt@xcolour.net>
Date: Tue, 21 Apr 2015 22:25:11 -0400
Subject: customize git pager and mergetool

---
 gitconfig | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/gitconfig b/gitconfig
index 2a0b2e3..e5dfcf0 100644
--- a/gitconfig
+++ b/gitconfig
@@ -15,9 +15,20 @@
     editor = vim
     autocrlf = input
     excludesfile = /Users/matt/.gitignore
+    pager = less -+$LESS -RSX
 
 [push]
     default = nothing
 
 [color]
     ui = true
+
+[mergetool]
+    keepTemporaries = false
+    prompt = false
+
+[merge]
+    tool = meld
+
+[diff]
+    tool = meld
-- 
cgit v1.2.3