Merge branch 'maint'

* maint: Paper bag fix diff invocation in 'git stash show'
git-mirror · Oct 19, 2007 · 7840ce6 · 7840ce6
2 parents f5bf6fe + e7187e4
commit 7840ce6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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 () {