From: Jeff King <peff@peff.net>
To: Kevin Ballard <kevin@sb.org>
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>,
Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>,
Thomas Rast <trast@student.ethz.ch>,
git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>
Subject: Re: [PATCH] rebase -i: remove undocumented '--verify' flag
Date: Tue, 23 Nov 2010 09:41:33 -0500 [thread overview]
Message-ID: <20101123144133.GA3145@sigill.intra.peff.net> (raw)
In-Reply-To: <CA8E4FB8-70F7-415C-85DE-746B1113AE4C@sb.org>
On Mon, Nov 22, 2010 at 06:24:10PM -0800, Kevin Ballard wrote:
> On Nov 22, 2010, at 12:21 PM, Martin von Zweigbergk wrote:
>
> > (I hope this is the correct way of including a patch. I have only used
> > 'git send-email before'. I noticed that Jeff seems to remove the first
> > three lines and put a '-- 8> --' before, but others do not. What does
> > the mysterious header mean?)
>
> It's actually 8< or >8, and it's a little ASCII icon of a pair of scissors.
> If a line consists mainly of dashes and scissors then `git am --scissors`
> can split the mail on that line and treat the rest of the body after that
> line as a patch.
Yep. I don't know if Junio actually uses --scissors these days. Before
it existed, he would just snip the parts above the marker manually,
which was not a big deal because he reads his mail in emacs. If that is
still the case, then it doesn't really matter what the marker is, as
long as he recognizes it, and it is not "---", which is the special
marker for splitting commit message from cover letter.
That being said, people other than Junio may apply your patch, so if you
are going to use such a marker, making it look scissor-like is probably
the best thing to do.
-Peff
next prev parent reply other threads:[~2010-11-23 14:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-22 6:48 [PATCH] rebase -i: remove undocumented '--verify' flag Martin von Zweigbergk
2010-11-22 12:53 ` Matthieu Moy
2010-11-22 13:14 ` Thomas Rast
2010-11-22 13:29 ` Matthieu Moy
2010-11-22 20:21 ` Martin von Zweigbergk
2010-11-23 2:24 ` Kevin Ballard
2010-11-23 14:41 ` Jeff King [this message]
2010-11-23 20:08 ` Junio C Hamano
2010-11-23 20:14 ` Junio C Hamano
2010-11-24 1:09 ` Martin von Zweigbergk
2010-11-22 13:49 ` Martin von Zweigbergk
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101123144133.GA3145@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=kevin@sb.org \
--cc=martin.von.zweigbergk@gmail.com \
--cc=trast@student.ethz.ch \
/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.
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 NNTP newsgroup(s).