From: Torsten Bögershausen <tboegi@xxxxxx> Unified auto CRLF handling, V3 I did the review, some minor changes: against v2: - SAFE_CRLF_RENORMALIZE is now 3, not 4 so that enum safe_crlf uses 0..3 - V2 had unintentionally commented out the ident TC, fixed that What more may be useful to bring this series forward? Torsten Bögershausen (3): convert: unify the "auto" handling of CRLF read-cache: factor out get_sha1_from_index() helper correct ce_compare_data() in a middle of a merge Documentation/config.txt | 12 +++---- Documentation/gitattributes.txt | 15 +++++---- builtin/apply.c | 3 +- builtin/blame.c | 2 +- cache.h | 4 +++ combine-diff.c | 3 +- convert.c | 65 +++++++++++++++++++++++------------- convert.h | 18 +++++++--- diff.c | 3 +- dir.c | 2 +- read-cache.c | 33 +++++++++++------- sha1_file.c | 12 +++++-- t/t0025-crlf-auto.sh | 4 +-- t/t0027-auto-crlf.sh | 29 ++++++++-------- t/t6038-merge-text-auto.sh | 74 ++++++++++++++++++++++++----------------- 15 files changed, 170 insertions(+), 109 deletions(-) -- 2.0.0.rc1.6318.g0c2c796 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html