Git development
 help / color / mirror / Atom feed
From: "Mikael Magnusson" <mikachu@gmail.com>
To: "Junio C Hamano" <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Fix grammar in git-rev-parse(1).
Date: Sun, 6 Jul 2008 22:34:21 +0200	[thread overview]
Message-ID: <237967ef0807061334t681ad234vdb37cfe56af2e483@mail.gmail.com> (raw)

---
 Documentation/git-rev-parse.txt |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index 59e95ad..ba65bfa 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -301,9 +301,9 @@ It is the set of commits that are reachable from
either one of
 `r1` or `r2` but not from both.

 Two other shorthands for naming a set that is formed by a commit
-and its parent commits exists.  `r1{caret}@` notation means all
+and its parent commits exist.  The `r1{caret}@` notation means all
 parents of `r1`.  `r1{caret}!` includes commit `r1` but excludes
-its all parents.
+all of its parents.

 Here are a handful of examples:

-- 
1.5.6.GIT


2008/7/6 Junio C Hamano <gitster@pobox.com>:
> "Dmitry Potapov" <dpotapov@gmail.com> writes:
>
>> On Fri, Jun 20, 2008 at 2:05 PM, Jakub Narebski <jnareb@gmail.com> wrote:
>>>
>>> There is shortcut for rev^..rev, namely rev^! (I'm not sure if it is
>>> documented anywhere, though),
>>
>> The latter is not exactly a shortcut for the former.  You can try it at any
>> merge commit, and you will see different log. For instance, in Git repo:
>> ...
>> So, I believe, rev^! means --first-parent rev^..rev
>
> Not quite.  From Documentation/git-rev-parse.txt:
>
>    SPECIFYING RANGES
>    -----------------
>
>    Two other shorthands for naming a set that is formed by a commit
>    and its parent commits exists.  `r1{caret}@` notation means all
>    parents of `r1`.  `r1{caret}!` includes commit `r1` but excludes
>    its all parents.
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>



-- 
Mikael Magnusson

                 reply	other threads:[~2008-07-06 20:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=237967ef0807061334t681ad234vdb37cfe56af2e483@mail.gmail.com \
    --to=mikachu@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox