| commit | b5f6c3279692058cb20c7907359aab1e49298190 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 May 2015 04:14:39 +0000 (5 21:14 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 6 May 2015 04:14:39 +0000 (5 21:14 -0700) | ||
| tree | 4e9364ae9eaebed41b0f6edb5beb7f9823e4c791 | treesnapshot (tar.gz zip) |
| parent | b3f9a45bd2279fbf244ba4a5facd9c6218cbeb0d | commitdiff |
| parent | ed178ef13a26136d86ff4e33bb7b1afb5033f908 | commitdiff |
Merge branch 'jk/stash-require-clean-index' into next
"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 |