git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work

From
Jacob Keller <jacob.keller@gmail.com>
Date
Dec 1, 2016, 20:07 UTC
Message-ID
<CA+P7+xoJb=SukbnJVJrXR6WV9+UtGnsn776KGkrHC7X-T_wZWg@mail.gmail.com>
In-Reply-To
<20161130170232.19685-1-tboegi@web.de>
On Wed, Nov 30, 2016 at 9:02 AM,  <tboegi@web.de> wrote:
Show 10 quoted lines
> From: Torsten Bögershausen <tboegi@web.de>
> 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

Previous: Junio C HamanoNext: Junio C Hamano
Message 7 of 9 in “convert: git cherry-pick -Xrenormalize did not work”
  1. 1/1 convert: git cherry-pick -Xrenormalize did not worktboegi@web.de, Nov 29, 2016
  2. Junio C HamanoNov 29, 2016
  3. Torsten BögershausenNov 29, 2016
  4. Junio C HamanoNov 29, 2016
  5. 1/1 convert: git cherry-pick -Xrenormalize did not worktboegi@web.de, Nov 30, 2016
  6. Junio C HamanoDec 1, 2016
  7. Jacob KellerDec 1, 2016
  8. Junio C HamanoDec 1, 2016
  9. Torsten BögershausenDec 2, 2016

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.