Merge branch 'maint'

* maint:
Paper bag fix diff invocation in 'git stash show'

diff --git a/git-stash.sh b/git-stash.sh
index def3163ebbb4f88f800b7cf3c7b856f90b5ae73f..5bbda47b7b6e286e7e8e5d002d7ed461a831b579 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -110,7 +110,7 @@ show_stash () {
 
        w_commit=$(git rev-parse --verify "$s") &&
        b_commit=$(git rev-parse --verify "$s^") &&
-       git diff-tree $flags $b_commit $w_commit
+       git diff $flags $b_commit $w_commit
 }
 
 apply_stash () {