git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Jacob Keller <jacob.keller@gmail.com>
To: "Torsten Bögershausen" <tboegi@web.de>
Cc: Git mailing list <git@vger.kernel.org>, eevee.reply@veekun.com
Subject: Re: [PATCH v2 1/1] convert: git cherry-pick -Xrenormalize did not work
Date: Thu, 1 Dec 2016 12:07:13 -0800	[thread overview]
Message-ID: <CA+P7+xoJb=SukbnJVJrXR6WV9+UtGnsn776KGkrHC7X-T_wZWg@mail.gmail.com> (raw)
In-Reply-To: <20161130170232.19685-1-tboegi@web.de>

On Wed, Nov 30, 2016 at 9:02 AM,  <tboegi@web.de> wrote:
> 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

  parent reply	other threads:[~2016-12-01 20:07 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <6a7e155-f399-c9f8-c69e-8164e0735dfb@veekun.com>
2016-11-29 16:30 ` [PATCH v1 1/1] convert: git cherry-pick -Xrenormalize did not work tboegi
2016-11-29 18:42   ` Junio C Hamano
2016-11-29 20:16     ` Torsten Bögershausen
2016-11-29 20:45       ` Junio C Hamano
2016-11-30 17:02 ` [PATCH v2 " tboegi
2016-12-01 18:27   ` Junio C Hamano
2016-12-01 20:07   ` Jacob Keller [this message]
2016-12-01 20:24     ` Junio C Hamano
2016-12-02 12:20       ` Torsten Bögershausen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CA+P7+xoJb=SukbnJVJrXR6WV9+UtGnsn776KGkrHC7X-T_wZWg@mail.gmail.com' \
    --to=jacob.keller@gmail.com \
    --cc=eevee.reply@veekun.com \
    --cc=git@vger.kernel.org \
    --cc=tboegi@web.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).