--- post-update.orig	2010-01-14 00:04:33.000000000 -0800
+++ post-update	2010-01-14 00:09:39.000000000 -0800
@@ -68,6 +68,13 @@
 	(cd $GIT_WORK_TREE
 	git-diff-index -R --name-status HEAD >&2
 	git-reset --hard HEAD)
+
+        if [ "$wc_dirty" -ne 0 -o "$index_dirty" -ne 0 ]
+        then
+		echo "W:popping stashed changes - see git-stash(1)" >&2
+                (cd $GIT_WORK_TREE
+                git stash pop)        
+        fi
 }
 
 if [ "$is_bare" = "false" ]