--- a/.bashrc	Thu Sep 26 01:10:27 2013 -0700
+++ b/.bashrc	Thu Sep 26 02:19:42 2013 -0700
@@ -166,10 +166,7 @@
     emacs +`wc -l "$FILE"` $@
 }
 
-git-diff-master() {
-    # differences of a git repository with master
-    git diff $(git merge-base HEAD master)
-}
+### find functionality
 
 EXCLUDES="(\.svn)|(\.mo$)|(\.po$)|(\.pyc$)|(\.hg$)|(\.git$)"
 ff() {
@@ -452,9 +449,20 @@
 }
 
 difffiles() {
+    # which files are diffed; could use `lsdiff`
     grep '^+++ ' $@ | sed 's/+++ b\///'
 }
 
+git-diff-master() {
+    # differences of a git repository with master
+    git diff $(git merge-base HEAD master)
+}
+
+git-diff-total() {
+    # diff of both added + modified files
+    combinediff <(git diff) <(git diff --cached)
+}
+
 hg-update-all() {
     # update all hg repositories in the current directory
     for i in *;