Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work
flat view
From: Jacob Keller <hidden>
Date: 2016-12-01 20:07:38
Possibly related (same subject, not in this thread)
- 2016-12-02 · Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work · Torsten Bögershausen <hidden>
- 2016-12-01 · Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work · Junio C Hamano <hidden>
- 2016-12-01 · Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work · Junio C Hamano <hidden>
On Wed, Nov 30, 2016 at 9:02 AM, [off-list ref] wrote:
quoted hunk ↗ jump to hunk
From: Torsten Bögershausen <redacted>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