mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* 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
parent f5bf6feb05 e7187e4e0f
commit 7840ce6cb2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
git-stash.sh
View File

@ -110,7 +110,7 @@ show_stash () {
w_commit=$(git rev-parse --verify "$s") && w_commit=$(git rev-parse --verify "$s") &&
b_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 () { apply_stash () {