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

Re: Enabling scissors by default?

From
Junio C Hamano <gitster@pobox.com>
Date
Jan 9, 2013, 17:40 UTC
Message-ID
<7vk3rm6yr9.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20130109171011.GB5332@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 7 quoted lines
> On Tue, Jan 08, 2013 at 03:36:09PM -0800, Junio C Hamano wrote:
>
>> You could introduce a new configuration variable "am.scissors" and
>> personally turn it on, though.  Setting that variable *does* count
>> as the user explicitly asking for it.
>
> I think we have mailinfo.scissors already.

Oh, spoiler. I was hoping that I could entice new people into doing a little digging on their own X-<.

Show 19 quoted lines
>> > I often see patches being tweaked in response to feedback and
>> > resubmitted, usually with a description of what has changed since the
>> > previous version.  Such descriptions don't need to be in the change
>> > log when it is finally applied and seem a perfect use of scissors.
>> 
>> Putting such small logs under "---" line is the accepted practice.
>
> Maybe it is just me, but I find the scissors form more readable, because
> the "cover letter" material often serves to introduce and give context
> to the patch (e.g., "Thanks for your feedback. I've tried to do X, and
> it came out well. Here's the patch." serves as an introduction, and
> logically comes before the commit message itself).
>
> That does not say anything one way or another about how dangerous or not
> it might be to enable scissors by default. Just my two cents that I like
> the scissors style for patches that come as part of a discussion (and I
> prefer the "---" style when making comments on the contents of a patch;
> i.e., when the comments make more sense to be read after reading the
> commit message to understand what the patch does).

Yes, scissors have their uses, namely when presenting a patch in a discussion context. Otherwise we wouldn't have introduced it in the first place.

But the "desription of what has changed since the previous version" use case I was responding to is where the space below "---" is meant to be used from very early days of Git (the convention established on the kernel list).

Previous: Jeff King
Message 6 of 6 in “Enabling scissors by default?”
  1. Phillip SusiJan 8, 2013
  2. Junio C HamanoJan 8, 2013
  3. Phillip SusiJan 8, 2013
  4. Junio C HamanoJan 8, 2013
  5. Jeff KingJan 9, 2013
  6. Junio C HamanoJan 9, 2013

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.