On Wed, Nov 30, 2016 at 9:02 AM, <tboegi@xxxxxx> wrote: > From: Torsten Bögershausen <tboegi@xxxxxx> > diff --git a/convert.c b/convert.c > index be91358..f8e4dfe 100644 > --- a/convert.c > +++ b/convert.c > @@ -281,13 +281,13 @@ static int crlf_to_git(const char *path, const char *src, size_t len, > /* > * If the file in the index has any CR in it, do not convert. > * This is the new safer autocrlf handling. > + - unless we want to renormalize in a merge or cherry-pick Style nit, usually this line should begin with an aligned *? I think it's not really that big a deal, though. Thanks, Jake