Merge branch 'maint'

* maint:
  Paper bag fix diff invocation in 'git stash show'
This commit is contained in:
Shawn O. Pearce 2007-10-19 02:18:21 -04:00
commit 7840ce6cb2

View file

@ -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 () {