From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 May 2008 20:37:08 +0000 (-0700)
Subject: Merge branch 'js/ignore-submodule'
X-Git-Tag: v1.5.6-rc0~12
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=7e83003029ed488253f6173b047a9c77933c8561;p=git.git

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
---

7e83003029ed488253f6173b047a9c77933c8561