diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-09-09 12:54:00 -0700 |
| commit | 753aaf3aabe698bbc965fdbb66aceb2e5eda2454 (patch) | |
| tree | b4895045aa743e1e57d79557c978ee3fa48a227c /git-stash.sh | |
| parent | Merge branch 'mm/log-branch-desc-plug-leak' (diff) | |
| parent | stash: default listing to working-tree diff (diff) | |
| download | tgif-753aaf3aabe698bbc965fdbb66aceb2e5eda2454.tar.xz | |
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-x | git-stash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh index bcc757b390..9c1ba8e4b8 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 () { |