Merge branch 'tb/add-renormalize'
"git add --renormalize ." is a new and safer way to record the fact that you are correcting the end-of-line convention and other "convert_to_git()" glitches in the in-repository data. * tb/add-renormalize: add: introduce "--renormalize"
This commit is contained in:
1
cache.h
1
cache.h
@ -711,6 +711,7 @@ extern int ie_modified(struct index_state *, const struct cache_entry *, struct
|
||||
|
||||
#define HASH_WRITE_OBJECT 1
|
||||
#define HASH_FORMAT_CHECK 2
|
||||
#define HASH_RENORMALIZE 4
|
||||
extern int index_fd(struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
|
||||
extern int index_path(struct object_id *oid, const char *path, struct stat *st, unsigned flags);
|
||||
|
||||
|
Reference in New Issue
Block a user