Re: [PATCH] rebase -i: remove undocumented '--verify' flag

From: Jeff King <peff@peff.net>
Date: Nov 23, 2010, 14:41 UTC
Message-ID: <20101123144133.GA3145@sigill.intra.peff.net>
In-Reply-To: <CA8E4FB8-70F7-415C-85DE-746B1113AE4C@sb.org>

On Mon, Nov 22, 2010 at 06:24:10PM -0800, Kevin Ballard wrote:

Show 11 quoted lines

> 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