aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-20 17:16:29 -0700
committerJunio C Hamano <gitster@pobox.com>2008-07-20 17:16:29 -0700
commitfa4946b5532ff911565c882892a715616c22cdec (patch)
treed6c503fcee7de1794ae552760ad313501714dad1 /cache.h
parent107cee507884dc9b3c5d3759e8e50c9c47e2ddcd (diff)
parent2d9c572578c72bd6691e80a9feed7d631baf007f (diff)
downloadgit-fa4946b5532ff911565c882892a715616c22cdec.tar.gz
git-fa4946b5532ff911565c882892a715616c22cdec.tar.xz
Merge branch 'maint'
* maint: fix usage string for git grep refresh-index: fix bitmask assignment Conflicts: builtin-grep.c
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index a779d9207..305e2f701 100644
--- a/cache.h
+++ b/cache.h
@@ -397,7 +397,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 */
+#define REFRESH_IGNORE_SUBMODULES 0x0010 /* ignore submodules */
extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen);
struct lock_file {