diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:49:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-26 13:49:19 -0700 |
| commit | cb9ec8e23e6aee90f80635fdaaed919fe2c7d675 (patch) | |
| tree | 3874f8efbb371eb0b7ef98c9c2daa24f60b09ab1 /t/t4135-apply-weird-filenames.sh | |
| parent | Merge branch 'jk/git-no-more-argv0-path-munging' into maint (diff) | |
| parent | stash: require a clean index to apply (diff) | |
| download | tgif-cb9ec8e23e6aee90f80635fdaaed919fe2c7d675.tar.xz | |
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
Diffstat (limited to 't/t4135-apply-weird-filenames.sh')
0 files changed, 0 insertions, 0 deletions