All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael J Gruber <git@drmicha.warpmail.net>
To: Jeff King <peff@peff.net>
Cc: Pete Harlan <pgit@pcharlan.com>,
	Hermann Gausterer <git-mailinglist@mrq1.org>,
	git list <git@vger.kernel.org>
Subject: Re: [PATCH] add-interactive: shortcut to add hunk and quit
Date: Wed, 18 May 2011 11:26:07 +0200	[thread overview]
Message-ID: <4DD390AF.9020705@drmicha.warpmail.net> (raw)
In-Reply-To: <20110518064515.GA29612@sigill.intra.peff.net>

Jeff King venit, vidit, dixit 18.05.2011 08:45:
> On Tue, May 17, 2011 at 11:40:03PM -0700, Pete Harlan wrote:
> 
>> On 05/17/2011 12:12 AM, Hermann Gausterer wrote:
>>> this combines the two "add -i" commands "y"+"q" to one.
>>
>> ...
>>
>>>         y - stage this hunk
>>>         n - do not stage this hunk
>>>         q - quit; do not stage this hunk nor any of the remaining ones
>>> +       Q - stage this hunk but none of the remaining ones
>>>         a - stage this hunk and all later hunks in the file
>>>         d - do not stage this hunk nor any of the later hunks in the file
>>>         g - select a hunk to go to
>>
>> If "q" means "quit", I would expect "Q" to mean something like "quit
>> immediately" (perhaps even undoing earlier adds), not "do something
>> that 'q' wouldn't do, and then quit".
> 
> I agree. There was some discussion in another thread recently of the
> atomicity of git-add (right now it applies the changes to each file
> after all of its hunks are done). I would expect "q" to be "quit and
> apply what I told you so far" and "Q" to be "quit and do not apply
> anything".
> 
>> Perhaps "o" (for "stage exactly [o]ne commit"), or "t" for "stage
>> [t]his commit" would be reasonable alternatives?
> 
> We could also allow multiple commands at once, like "yq" (even in
> single-key mode, this would do the same thing).

So instead of having to

press y press q

I can now

hold SHIFT press q

Seeing the gain in that fails me completely. Also, why doesn't "yd"
deserve a shortcut? I would expect that to be used more often, as in:
"Yes, that was the hunk I wanted to add from this file, but what other
files have changes"?

Michael

  reply	other threads:[~2011-05-18  9:26 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-15 12:55 [PATCH] add-interactive: shortcut for add hunk and quit Hermann Gausterer
2011-05-15 20:30 ` Junio C Hamano
2011-05-16 16:26   ` [PATCH] add-interactive: shortcut to " Hermann Gausterer
2011-05-16 16:37     ` Matthieu Moy
2011-05-17  5:09       ` Junio C Hamano
2011-05-17  7:12         ` Hermann Gausterer
2011-05-18  6:40           ` Pete Harlan
2011-05-18  6:45             ` Jeff King
2011-05-18  9:26               ` Michael J Gruber [this message]
2011-05-18 15:28                 ` Junio C Hamano
2011-05-19 10:16                   ` Thomas Rast
2011-05-19 11:02                     ` Jeff King
2011-05-19 19:25                       ` Junio C Hamano
2011-05-19 19:42                         ` Jeff King
2011-05-18  8:43             ` Hermann Gausterer

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=4DD390AF.9020705@drmicha.warpmail.net \
    --to=git@drmicha.warpmail.net \
    --cc=git-mailinglist@mrq1.org \
    --cc=git@vger.kernel.org \
    --cc=peff@peff.net \
    --cc=pgit@pcharlan.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.