From 52e73a969da59233b09c87b6822dc181b8807c61 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lytedev.io>
Date: Tue, 21 Mar 2017 19:04:13 -0500
Subject: [PATCH] Add some git config stuff and a git plugin for vim

---
 misc/git/config             | 6 ++++++
 text-editor/neovim/init.vim | 1 +
 2 files changed, 7 insertions(+)

diff --git a/misc/git/config b/misc/git/config
index c8f7f8d..eddd686 100644
--- a/misc/git/config
+++ b/misc/git/config
@@ -10,3 +10,9 @@
 
 [http "https://gopkg.in"]
 	followRedirects = true
+[diff]
+	tool = vimdiff
+[difftool]
+	prompt = false
+[alias]
+	d = difftool
diff --git a/text-editor/neovim/init.vim b/text-editor/neovim/init.vim
index 0b1fe65..d3d6ccb 100644
--- a/text-editor/neovim/init.vim
+++ b/text-editor/neovim/init.vim
@@ -119,6 +119,7 @@ Plug 'dhruvasagar/vim-table-mode' " for creating and editing character tables
 Plug 'lytedev/vim-superman' " view man pages with vim
 Plug 'tpope/vim-surround' " quickly modify text surrounding objects
 Plug 'tpope/vim-speeddating' " vim knows about date-like text objects
+Plug 'tpope/vim-fugitive' " vim git stuff
 Plug 'michaeljsmith/vim-indent-object' " adds an indentation level text object
 Plug 'wellle/targets.vim' " adds some more handy text objects
 Plug 'ternjs/tern_for_vim', { 'do': 'npm install' } " javascript helpful things