diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:37:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-05-25 13:37:08 -0700 |
| commit | 7e83003029ed488253f6173b047a9c77933c8561 (patch) | |
| tree | 191fd7e272b6adde953d76b974a3ed9de282b128 /cache.h | |
| parent | 58dd4915ba1a933af0087e351743e31b2f9be878 (diff) | |
| parent | 6848d58c60b7af365ce54cf3e3b274a2f9da2e7e (diff) | |
| download | git-7e83003029ed488253f6173b047a9c77933c8561.tar.gz git-7e83003029ed488253f6173b047a9c77933c8561.tar.xz | |
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
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -388,6 +388,7 @@ extern void fill_stat_cache_info(struct cache_entry *ce, struct stat *st); #define REFRESH_UNMERGED 0x0002 /* allow unmerged */ #define REFRESH_QUIET 0x0004 /* be quiet about it */ #define REFRESH_IGNORE_MISSING 0x0008 /* ignore non-existent */ +#define REFRESH_IGNORE_SUBMODULES 0x0008 /* ignore submodules */ extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen); struct lock_file { |