From 9be5150c9f689b954cd269c1aa5fe0957198c96c Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Thu, 10 Sep 2015 12:09:56 +0200
Subject: misc

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 .gitconfig | 5 +++++
 1 file changed, 5 insertions(+)

(limited to '.gitconfig')

diff --git a/.gitconfig b/.gitconfig
index c09375a..8a95fab 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -40,9 +40,14 @@
 	cmd = vim -f \"$MERGED\"
 [mergetool "vimdiff3"]
 	cmd = vim -f -d -c \"wincmd J\" \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
+[mergetool "splice"]
+	cmd = "vim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+	trustExitCode = true
 [core]
 	excludesfile = ~/.gitignore
 	compression = 9
 	attributesfile = ~/git/dotfiles/.gitattributes
 [log]
 	decorate = full
+[gc]
+	autopacklimit = 20
-- 
cgit v1.2.3-24-g4f1b