diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 17:21:25 (GMT) |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-10-09 17:21:25 (GMT) |
| commit | a3c76f2858b1ceae5b70b7ee69d2663143dcce49 (patch) | |
| tree | 1b60773c0fde8c6c2551e445f402985e1921cc59 /cache.h | |
| parent | d5c527448db30be55553e0b125015e8d444f8dbc (diff) | |
| parent | 394258190c76dd7944688a3a28931071ec02087d (diff) | |
| download | git-a3c76f2858b1ceae5b70b7ee69d2663143dcce49.zip git-a3c76f2858b1ceae5b70b7ee69d2663143dcce49.tar.gz git-a3c76f2858b1ceae5b70b7ee69d2663143dcce49.tar.bz2 | |
Merge branch 'jc/add-ita'
* jc/add-ita:
git-add --intent-to-add (-N)
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -377,6 +377,7 @@ extern int index_name_pos(const struct index_state *, const char *name, int name #define ADD_CACHE_OK_TO_REPLACE 2 /* Ok to replace file/directory */ #define ADD_CACHE_SKIP_DFCHECK 4 /* Ok to skip DF conflict checks */ #define ADD_CACHE_JUST_APPEND 8 /* Append only; tree.c::read_tree() */ +#define ADD_CACHE_NEW_ONLY 16 /* Do not replace existing ones */ extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option); extern struct cache_entry *refresh_cache_entry(struct cache_entry *ce, int really); extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name); @@ -386,6 +387,7 @@ extern int remove_file_from_index(struct index_state *, const char *path); #define ADD_CACHE_PRETEND 2 #define ADD_CACHE_IGNORE_ERRORS 4 #define ADD_CACHE_IGNORE_REMOVAL 8 +#define ADD_CACHE_INTENT 16 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); |