mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'nd/reset-intent-to-add'

Browse Source 
* nd/reset-intent-to-add:
  reset: support "--mixed --intent-to-add" mode
This commit is contained in:
Junio C Hamano
2014-02-27 14:01:40 -08:00
parent 795dd116bb b4b313f94a
commit 8336832ad9
5 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cache.h
View File

@ -487,6 +487,7 @@ extern int add_to_index(struct index_state *, const char *path, struct stat *, i
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, unsigned int refresh_options);
extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
extern int index_name_is_other(const struct index_state *, const char *, int);
extern void *read_blob_data_from_index(struct index_state *, const char *, unsigned long *);