git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Vineet Kumar <vineet@doorstop.net>
To: git@vger.kernel.org
Subject: Re: [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive.
Date: Mon, 10 Mar 2008 08:47:19 -0700	[thread overview]
Message-ID: <20080310154719.GA11449@doorstop.net> (raw)
In-Reply-To: <7vk5ke14hp.fsf@gitster.siamese.dyndns.org>

[-- Attachment #1: Type: text/plain, Size: 1830 bytes --]

* Junio C Hamano (gitster@pobox.com) [080307 16:05]:
> Vineet Kumar <vineet@doorstop.net> writes:
> 
> > There were some inconsistent mixing of "this hunk" and "that hunk" referring
> > to the same hunk; I switched them all to "this".  There was also a missing
> > "the".
> > ---
> >  Documentation/git-add.txt |    8 ++++----
> >  1 files changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
> > index 4779909..bc74fc0 100644
> > --- a/Documentation/git-add.txt
> > +++ b/Documentation/git-add.txt
> > @@ -207,10 +207,10 @@ patch::
> >    and the working tree file and asks you if you want to stage
> >    the change of each hunk.  You can say:
> >  
> > -       y - add the change from that hunk to index
> > -       n - do not add the change from that hunk to index
> > -       a - add the change from that hunk and all the rest to index
> > -       d - do not the change from that hunk nor any of the rest to index
> > +       y - add the change from this hunk to index
> > +       n - do not add the change from this hunk to index
> > +       a - add the change from this hunk and all the rest to index
> > +       d - do not add the change from this hunk nor any of the rest to index
> >         j - do not decide on this hunk now, and view the next
> >             undecided hunk
> >         J - do not decide on this hunk now, and view the next hunk
> 
> Hmm.  Do we perhaps want to match this with the help text in
> "sub help_patch_cmd" of git-add--interactive.perl?

Yeah, personally I like those ones better; I think they're more
readable.  Any ideas on how to have them use the same source, or should
I just duplicate the ones from git-add--interactive.perl into
git-add.txt?

Vineet
-- 
http://www.doorstop.net/

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 189 bytes --]

  reply	other threads:[~2008-03-10 15:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-07 22:16 [PATCH] Minor wording changes in the keyboard descriptions in git-add --interactive Vineet Kumar
2008-03-07 23:47 ` Junio C Hamano
2008-03-10 15:47   ` Vineet Kumar [this message]
2008-03-13 18:32     ` Vineet Kumar

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=20080310154719.GA11449@doorstop.net \
    --to=vineet@doorstop.net \
    --cc=git@vger.kernel.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.
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).