diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 02:18:21 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-10-19 02:18:21 -0400 |
| commit | 7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3 (patch) | |
| tree | b5de550bb332eabf93b5391ad299bba3e1144fa5 | |
| parent | f5bf6feb05b8c89c448ded6e6fad0eb58ef35463 (diff) | |
| parent | e7187e4e0fece6c2947fbceff251f3ce69ae0aa8 (diff) | |
| download | git-7840ce6cb24a9d65152d45e08f5d7cf7dc97a2e3.tar.gz | |
Merge branch 'maint'
* maint:
Paper bag fix diff invocation in 'git stash show'
| -rwxr-xr-x | git-stash.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-stash.sh b/git-stash.sh index def3163ebb..5bbda47b7b 100755 --- 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 () { |