| commit | beb48832997fbb662102f5458151a2585087e64b | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Jun 2015 21:44:50 +0000 (16 14:44 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 Jun 2015 21:44:50 +0000 (16 14:44 -0700) | ||
| tree | eee5553057912db7e497b54f3a4a6e3ed37d4345 | treesnapshot (tar.gz zip) |
| parent | 151ec95f4613425866ccce3a999f8eee0c1bd4ca | commitdiff |
| parent | 19376104a8251a7e6c56579cdcd2eb0a106d1fd6 | 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:
Revert "stash: require a clean index to apply"
"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:
Revert "stash: require a clean index to apply"
| git-stash.sh | diff1 | diff2 | blobhistory |
| t/t3903-stash.sh | diff1 | diff2 | blobhistory |