summaryrefslogtreecommitdiff
path: root/git-stash.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-09-09 19:54:00 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-09-09 19:54:00 (GMT)
commit753aaf3aabe698bbc965fdbb66aceb2e5eda2454 (patch)
treeb4895045aa743e1e57d79557c978ee3fa48a227c /git-stash.sh
parent1bada2b0ccd19ca40c18f01cb4d66675d32d385c (diff)
parent288c67caf64af111aeb7c45cb8b6ba586a61c724 (diff)
downloadgit-753aaf3aabe698bbc965fdbb66aceb2e5eda2454.zip
git-753aaf3aabe698bbc965fdbb66aceb2e5eda2454.tar.gz
git-753aaf3aabe698bbc965fdbb66aceb2e5eda2454.tar.bz2
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
Diffstat (limited to 'git-stash.sh')
-rwxr-xr-xgit-stash.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh
index bcc757b..9c1ba8e 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -297,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 () {