diff --git a/bash_aliases b/bash_aliases
index 979dee1..bad2f5d 100755
--- a/bash_aliases
+++ b/bash_aliases
@@ -93,6 +93,8 @@ function git-config-joshs()
     git config --global core.excludesfile ${HOME}/.gitignore
     git config --global core.pager 'less -FRXi'
     git config --global alias.dc 'diff --cached'
+    git config --global alias.mergef 'merge FETCH_HEAD'
+    git config --global alias.incoming '!git fetch; git log ..FETCH_HEAD'
     git config --global alias.gdiff 'difftool -y -t gvimdiff'
     git config --global alias.gdiffc 'difftool -y -t gvimdiff --cached'
     if [ -e /bin/cygwin1.dll ]; then