Merge branch 'master' into next
commitfa9aa00c280b61d5b35b6e230cadd7784364a671
authorJunio C Hamano <gitster@pobox.com>
Mon, 27 Sep 2010 04:43:59 +0000 (26 21:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 27 Sep 2010 04:43:59 +0000 (26 21:43 -0700)
tree292a8881edaeb83f233a58e39d06536e4847082b
parent2a10b71f738b8b77ba8d243574f537a54dbf9a62
parent9027fa9eb7df606b6658dd48a40bb993ce222ddd
Merge branch 'master' into next

* master:
  git-stash: fix flag parsing
  t/t3903-stash: improve testing of git-stash show