Merge branch 'js/ignore-submodule'
commit7e83003029ed488253f6173b047a9c77933c8561
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 20:37:08 +0000 (25 13:37 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 May 2008 20:37:08 +0000 (25 13:37 -0700)
tree191fd7e272b6adde953d76b974a3ed9de282b128
parent58dd4915ba1a933af0087e351743e31b2f9be878
parent6848d58c60b7af365ce54cf3e3b274a2f9da2e7e
Merge branch 'js/ignore-submodule'

* js/ignore-submodule:
  Ignore dirty submodule states during rebase and stash
  Teach update-index about --ignore-submodules
  diff options: Introduce --ignore-submodules
cache.h
read-cache.c