Andrew's git / gitweb.git / diff
?
Merge branch 'jk/stash-require-clean-index'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:59 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:59 +0000 (12:21 -0700)
A hotfix for the topic already in 'master'.

* jk/stash-require-clean-index:
Revert "stash: require a clean index to apply"

1  2 
git-stash.sh patch | diff1 | diff2 | blob | history
t/t3903-stash.sh patch | diff1 | diff2 | blob | history
diff --cc git-stash.sh
Simple merge
diff --cc t/t3903-stash.sh
Simple merge