diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-11-27 02:06:37 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-11-27 02:06:37 (GMT) |
commit | af6e0fe3a589d58bfd508c1c6ccbeb38586eb06b (patch) | |
tree | 62cd50065b0a90efb4339ee10e66aade7f3e94f3 /cache.h | |
parent | 93bfe62ae3fa31429df25daf243f9778d9b929b9 (diff) | |
parent | 9472935d81eaf9faed771878c9df0216ae0d9045 (diff) | |
download | git-af6e0fe3a589d58bfd508c1c6ccbeb38586eb06b.zip git-af6e0fe3a589d58bfd508c1c6ccbeb38586eb06b.tar.gz git-af6e0fe3a589d58bfd508c1c6ccbeb38586eb06b.tar.bz2 |
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"
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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); |