| commit | cb9ec8e23e6aee90f80635fdaaed919fe2c7d675 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 20:49:19 +0000 (26 13:49 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 May 2015 20:49:19 +0000 (26 13:49 -0700) | ||
| tree | 3874f8efbb371eb0b7ef98c9c2daa24f60b09ab1 | treesnapshot (tar.gz zip) |
| parent | af6d7a6231c30bb8bb7220085edb574e540bfa19 | commitdiff |
| parent | ed178ef13a26136d86ff4e33bb7b1afb5033f908 | commitdiff |
Merge branch 'jk/stash-require-clean-index' into maint
"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