From: Jonathan Corbet <corbet@lwn.net>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: "Git List Mailing" <git@vger.kernel.org>,
"Junio Hamano C" <junio@pobox.com>,
LKML <linux-kernel@vger.kernel.org>,
"open list:DOCUMENTATION" <linux-doc@vger.kernel.org>,
"Jonathan Neuschäfer" <j.neuschaefer@gmx.net>
Subject: Re: [PATCH] Documentation: networking: device drivers: Remove stray asterisks
Date: Sat, 30 Nov 2019 18:45:12 -0700 [thread overview]
Message-ID: <20191130184512.23c6faaa@lwn.net> (raw)
In-Reply-To: <CAHk-=wj8tNhu76yxShwOfwVKk=qWznSFkAKyQfu6adcV8JzJkQ@mail.gmail.com>
On Sat, 30 Nov 2019 17:20:10 -0800
Linus Torvalds <torvalds@linux-foundation.org> wrote:
> Do you use some special options for git? Like --whitespace=nowarn or
> --3way or something like that?
Sigh, that has to be it. I have --ignore-whitespace in my script. When I
take that option out, the patch in question no longer applies.
Docs patches often come from relatively new folks, and I've found that I
needed that to apply a lot of their patches. But clearly that was not a
good choice; among other things, I've lost the opportunity to tell
people when their patches have the types of whitespace issues that this
option covers over. I've taken it out of the script and will only use it
by hand in cases where I'm sure that it won't cause problems.
Sorry for the screwup...
jon
next prev parent reply other threads:[~2019-12-01 1:45 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-01 1:03 Fw: [PATCH] Documentation: networking: device drivers: Remove stray asterisks Jonathan Corbet
2019-12-01 1:20 ` Linus Torvalds
2019-12-01 1:45 ` Jonathan Corbet [this message]
2019-12-01 6:35 ` Junio C Hamano
2019-12-01 14:28 ` Linus Torvalds
2019-12-01 15:27 ` Junio C Hamano
2019-12-02 9:50 ` Amit Choudhary
2019-12-02 14:22 ` Junio C Hamano
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=20191130184512.23c6faaa@lwn.net \
--to=corbet@lwn.net \
--cc=git@vger.kernel.org \
--cc=j.neuschaefer@gmx.net \
--cc=junio@pobox.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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).