![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 25 May 2008 20:37:08 +0000 (13:37 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 25 May 2008 20:37:08 +0000 (13:37 -0700) |
* js/ignore-submodule:
Ignore dirty submodule states during rebase and stash
Teach update-index about --ignore-submodules
diff options: Introduce --ignore-submodules
Ignore dirty submodule states during rebase and stash
Teach update-index about --ignore-submodules
diff options: Introduce --ignore-submodules
| 1 | 2 | |||
|---|---|---|---|---|
| cache.h | patch | | diff1 | | diff2 | | blob | history |
| read-cache.c | patch | | diff1 | | diff2 | | blob | history |
diff --cc cache.h
Simple merge
diff --cc read-cache.c
Simple merge