From 2213b78583285dbabf87893a9959e8d00e8826f3 Mon Sep 17 00:00:00 2001
From: Nick Nisi <nick@nisi.org>
Date: Thu, 20 Dec 2012 10:14:11 -0600
Subject: [PATCH] Updating some stuff [lazy commit]

---
 git/gitconfig.symlink | 4 ++++
 vim/vimrc.symlink     | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/git/gitconfig.symlink b/git/gitconfig.symlink
index f8714cf..7de119f 100644
--- a/git/gitconfig.symlink
+++ b/git/gitconfig.symlink
@@ -18,6 +18,8 @@
     gdc = diff --cached
     # show changed files for a commit
     cf = show --pretty="format:" --name-only
+    # undo a commit
+    undo = reset --soft
 
     # stash shortcuts
     sp = stash pop
@@ -82,3 +84,5 @@
 [core]
     excludesfile = ~/.gitignore_global
     pager = less -FXRS -x2
+[rerere]
+	enabled = true
diff --git a/vim/vimrc.symlink b/vim/vimrc.symlink
index 295620f..8a1e564 100644
--- a/vim/vimrc.symlink
+++ b/vim/vimrc.symlink
@@ -68,7 +68,7 @@ set softtabstop=4
 set ttyfast
 
 " allow matching of if/end, etc. with %
-runtime macros/matchit.vim
+" runtime macros/matchit.vim
 
 " highlight conflicts
 match ErrorMsg '^\(<\|=\|>\)\{7\}\([^=].\+\)\?$'
@@ -191,7 +191,7 @@ set laststatus=2 " show the satus line all the time
 " Additional, plugin-specific mappings are located under
 " the plugins section
 "
-nnoremap K :q<cr>
+" nnoremap K :q<cr>
 
 " remap esc and disable to force learning
 inoremap jk <esc>