From 964bf3b6d5d322519c3ae00553dc8912e3263709 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Tue, 17 Nov 2015 21:50:00 -0500
Subject: [PATCH] Lil updates

---
 gitconfig                  |   2 +-
 vim/spell/en.utf-8.add     |   1 +
 vim/spell/en.utf-8.add.spl | Bin 1045 -> 1046 bytes
 vimrc                      |   2 +-
 zsh/aliases                |   1 +
 5 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gitconfig b/gitconfig
index d66da0d..98d7241 100644
--- a/gitconfig
+++ b/gitconfig
@@ -34,6 +34,6 @@
   reflogExpire = 120
   reflogExpireUnreachable = 90
 [alias]
-  lg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
+  lg = log --graph --pretty=format:'%Cred%h%Creset %C(yellow)%an [%cn]%d%Creset %s %Cgreen(%cr)%Creset' --date=relative
 [rerere]
   enabled = true
diff --git a/vim/spell/en.utf-8.add b/vim/spell/en.utf-8.add
index 313e80d..faf4c97 100644
--- a/vim/spell/en.utf-8.add
+++ b/vim/spell/en.utf-8.add
@@ -81,3 +81,4 @@ google
 https
 youtube
 HD
+playlists
diff --git a/vim/spell/en.utf-8.add.spl b/vim/spell/en.utf-8.add.spl
index 86f57eac67c1fbd95cabce7ec9c9093fcacea5cd..33d664112c2bc8b4aa398f275f0d8c2163e26ed5 100644
GIT binary patch
delta 9
QcmbQrF^yw`C<`MO01d1H5C8xG

delta 7
OcmbQnF_mM3C<_1ym;wa=

diff --git a/vimrc b/vimrc
index 8242122..a2c2105 100644
--- a/vimrc
+++ b/vimrc
@@ -21,7 +21,7 @@ Plugin 'tpope/vim-obsession'
 Plugin 'tpope/vim-fugitive'
 Plugin 'tpope/vim-classpath'
 Plugin 'rking/ag.vim'
-Plugin 'christoomey/vim-tmux-navigator'
+"Plugin 'christoomey/vim-tmux-navigator'
 
 " Colors
 Plugin 'reedes/vim-colors-pencil'
diff --git a/zsh/aliases b/zsh/aliases
index 62ee8fc..163123f 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -96,6 +96,7 @@ alias zsh='vim ~/.zshrc'
 
 # Git
 alias am='git commit --amend'
+alias ama='git commit --amend -C head --author'
 alias ams='git commit -S --amend' # signed
 alias ammend='echo "use am instead"'
 alias amend='echo "use am instead"'