| commit | 05c39674f35f33b6d2311da6c63268b9e7739840 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 May 2015 20:17:52 +0000 (19 13:17 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 19 May 2015 20:17:52 +0000 (19 13:17 -0700) | ||
| tree | 8cb45c805c023f64a42d5ae9969865c863385ce1 | treesnapshot (tar.gz zip) |
| parent | 1645dbeff75d466230eb54b8548cfe9c9dcc9e5e | commitdiff |
| parent | ed178ef13a26136d86ff4e33bb7b1afb5033f908 | commitdiff |
Merge branch 'jk/stash-require-clean-index'
"git stash pop/apply" forgot to make sure that not just the working
tree is clean but also the index is clean. The latter is important
as a stash application can conflict and the index will be used for
conflict resolution.
* jk/stash-require-clean-index:
stash: require a clean index to apply
t3903: avoid applying onto dirty index
t3903: stop hard-coding commit sha1s
"git stash pop/apply" forgot to make sure that not just the working
tree is clean but also the index is clean. The latter is important
as a stash application can conflict and the index will be used for
conflict resolution.
* jk/stash-require-clean-index:
stash: require a clean index to apply
t3903: avoid applying onto dirty index
t3903: stop hard-coding commit sha1s
| git-stash.sh | diff1 | diff2 | blobhistory |