# HG changeset patch
# User Jeff Hammel <jhammel@mozilla.com>
# Date 1380187182 25200
# Node ID 6ee5d5cca9498e9a3470b99e58f2b253d790e564
# Parent  4f20f634f93fe5cf89f3f67abf5e9b3250bb5fee
.bashrc

diff -r 4f20f634f93f -r 6ee5d5cca949 .bashrc
--- 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 *;