Merge branch 'maint'

* maint: Paper bag fix diff invocation in 'git stash show'
2007-10-19 02:18:21 -04:00 · 2007-10-19 02:18:21 -04:00 · 7840ce6cb2
parent f5bf6feb05 e7187e4e0f
commit 7840ce6cb2
1 changed files with 1 additions and 1 deletions
--- 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 () {