diff --git a/.bash_aliases b/.bash_aliases
index 6127c7a..b511367 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -26,7 +26,6 @@ alias openurl="x-www-browser"
 [[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] && \
     . /usr/share/bash-completion/bash_completion
 
-#!/bin/bash
 # Passing arguments to a function
 gitrestore () {
     local file="$1"
@@ -39,6 +38,10 @@ gitrestore () {
     fi
 }
 
+gitbasebranch () {
+    echo "$(git show-branch -a | grep '\*' | grep -v `git rev-parse --abbrev-ref HEAD` | head -n1 | sed 's/.*\[\(.*\)\].*/\1/' | sed 's/[\^~].*//')"
+}
+
 #DISPLAY=:0.0 xhost +
 source ~/bashscripts/jd.bash
 
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index ead88bb..039d09f 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -57,6 +57,8 @@ set laststatus=2
 let g:airline_powerline_fonts = 1
 let g:airline_section_x = ''
 let g:airline_section_y = ''
+let g:airline_section_warning = ''
+let g:airline_section_z = '%l/%L:%c'
 
 
 set undofile                " Save undo's after file closes
diff --git a/.gitconfig b/.gitconfig
index 8f7800b..d36868b 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,8 +2,18 @@
 	email = jyapayne@gmail.com
 	name = Joey Yakimowich-Payne
 [core]
-	editor = vim
+	editor = nvim
 [color]
 	ui = auto
 [push]
 	default = current
+[alias]
+  basebranch = !bash -c 'git show-branch -a | grep "\\*" | grep -v $(git rev-parse --abbrev-ref HEAD) | head -n1 | sed \"s/.*\\[\\(.*\\)\\].*/\\1/\" | sed \"s/[\\^~].*//\"'
+  # list files which have changed since REVIEW_BASE
+  # (REVIEW_BASE defaults to 'master' in my zshrc)
+  files = !bash -c 'source $HOME/.bash_aliases && echo $(git basebranch) && git diff --name-only $(git merge-base HEAD \"$(git basebranch)\")'
+
+  # Same as above, but with a diff stat instead of just names
+  # (better for interactive use)
+  stat = !bash -c 'source $HOME/.bashrc && git diff --stat $(git merge-base HEAD \"$(git basebranch)\")'
+  review = !nvim -p $(git files) +\"tabdo Gdiff $(git basebranch)\" +\"let g:gitgutter_diff_base = '$(git basebranch)'\"