diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-27 16:39:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-27 16:39:57 -0700 |
| commit | b46f7e54fcb2d01757d834d14dfd040b6892d695 (patch) | |
| tree | f7d2743d855b605f5880cabbed6d21248682e430 /cache.h | |
| parent | 5a1e8707a6d9c7016a59d9987c1bc72ffe1252c8 (diff) | |
| parent | 1e5f764c93edfd8f6575b6ede769b079a1fc5a21 (diff) | |
| download | git-b46f7e54fcb2d01757d834d14dfd040b6892d695.tar.gz git-b46f7e54fcb2d01757d834d14dfd040b6892d695.tar.xz | |
Merge branch 'jc/add-addremove'
* jc/add-addremove:
builtin-add.c: optimize -A option and "git add ."
builtin-add.c: restructure the code for maintainability
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -379,6 +379,7 @@ extern int remove_file_from_index(struct index_state *, const char *path); #define ADD_CACHE_VERBOSE 1 #define ADD_CACHE_PRETEND 2 #define ADD_CACHE_IGNORE_ERRORS 4 +#define ADD_CACHE_IGNORE_REMOVAL 8 extern int add_to_index(struct index_state *, const char *path, struct stat *, int flags); extern int add_file_to_index(struct index_state *, const char *path, int flags); extern struct cache_entry *make_cache_entry(unsigned int mode, const unsigned char *sha1, const char *path, int stage, int refresh); |