Skip to main content

Browse the archive

Revision cb9ec8e23e6aee90f80635fdaaed919fe2c7d675 authored by Junio C Hamano on 26 May 2015, 20:49:19 UTC, committed by Junio C Hamano on 26 May 2015, 20:49:19 UTC 
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
2 parent s af6d7a6 + ed178ef
History
File Mode Size
sha1.c -rw-r--r-- 1.4 KB
sha1.h -rw-r--r-- 559 bytes
sha1ppc.S -rw-r--r-- 7.3 KB
back to top