Merge branch 'jk/stash-require-clean-index' into maint
commit351d06df519ee405a1926e0c6ee34d6a1dba6b46
authorJunio C Hamano <gitster@pobox.com>
Fri, 26 Jun 2015 06:03:26 +0000 (25 23:03 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 26 Jun 2015 06:03:27 +0000 (25 23:03 -0700)
tree10b8b7571b43748a993d2aa5d5eba2d1801c0ff1
parentb1f0802e9127b117bae7a4cfdc81495f7a9a09f3
parent19376104a8251a7e6c56579cdcd2eb0a106d1fd6
Merge branch 'jk/stash-require-clean-index' into maint

A hotfix for the topic already in 'master'.

* jk/stash-require-clean-index:
  Revert "stash: require a clean index to apply"
git-stash.sh
t/t3903-stash.sh