Merge branch 'jk/stash-list-p' into jch
commitb1a23ecbeb3b878cc669c0d6a5c1bf451f6cfbe3
authorJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:51:38 +0000 (21 11:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Aug 2014 18:51:38 +0000 (21 11:51 -0700)
tree0dd76b688d2390732aaae70f63f0535e4d7022b2
parent8b9ac1bc39029457fc5e1b753c2b8d8428d19c27
parent288c67caf64af111aeb7c45cb8b6ba586a61c724
Merge branch 'jk/stash-list-p' into jch

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
git-stash.sh