Merge branch 'jk/stash-list-p'

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

diff --combined git-stash.sh
index bcc757b3900b02595e5b432edcfd590e312b48ce,091c95cac8209e4de0dc5c642c0f3ab6c46f5393..9c1ba8e4b81a1f118af1967c2c72795ba12d6df0
--- 1/git-stash.sh
--- 2/git-stash.sh
+++ b/git-stash.sh
@@@ -13,7 -13,7 +13,7 @@@ USAGE="list [<options>
  
  SUBDIRECTORY_OK=Yes
  OPTIONS_SPEC=
 -START_DIR=`pwd`
 +START_DIR=$(pwd)
  . git-sh-setup
  . git-sh-i18n
  require_work_tree
@@@ -94,8 -94,7 +94,8 @@@ create_stash () 
                # ease of unpacking later.
                u_commit=$(
                        untracked_files | (
 -                              export GIT_INDEX_FILE="$TMPindex"
 +                              GIT_INDEX_FILE="$TMPindex" &&
 +                              export GIT_INDEX_FILE &&
                                rm -f "$TMPindex" &&
                                git update-index -z --add --remove --stdin &&
                                u_tree=$(git write-tree) &&
@@@ -297,7 -296,7 +297,7 @@@ have_stash () 
  
  list_stash () {
        have_stash || return 0
-       git log --format="%gd: %gs" -g "$@" $ref_stash --
+       git log --format="%gd: %gs" -g --first-parent -m "$@" $ref_stash --
  }
  
  show_stash () {