Merge branch 'jk/stash-list-p'
authorJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:00 +0000 (12:54 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 9 Sep 2014 19:54:00 +0000 (12:54 -0700)
Teach "git stash list -p" to show the difference between the base
commit version and the working tree version, which is in line with
what "git show" gives.

* jk/stash-list-p:
stash: default listing to working-tree diff

1  2 
git-stash.sh
diff --cc git-stash.sh
Simple merge