From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Ian Katz <ifreecarve@gmail.com>,
Miklos Vajna <vmiklos@frugalware.org>
Subject: Re: [PATCH] tutorial: clarify "pull" is "fetch + merge"
Date: Thu, 10 Jul 2008 22:41:37 -0400 [thread overview]
Message-ID: <20080711024137.GA14967@sigill.intra.peff.net> (raw)
In-Reply-To: <7vskuho3lm.fsf_-_@gitster.siamese.dyndns.org>
On Thu, Jul 10, 2008 at 02:01:57PM -0700, Junio C Hamano wrote:
> This adds a missing demonstration of the longhand form, and a new
> paragraph to explain why some people might want to fetch before pull.
A few English/typo nits below.
> +Alice can peek what Bob did without merging first, using the "fetch"
s/peek/& at/
> +command; this allows Alice to inspect what bob did, using a special
s/bob/\u&/
> -With this, Alice can perform the first operation alone using the
> +With this, Alice can perform the first part of "pull" operation alone using the
Should be either 'the "pull" operation' or 'a "pull" operation'.
-Peff
prev parent reply other threads:[~2008-07-11 2:44 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <dc5b80bf0807100652y394e655lfcdd819cc4506afa@mail.gmail.com>
[not found] ` <alpine.DEB.1.00.0807101524440.18205@racer>
[not found] ` <dc5b80bf0807100729h3e247f68qc48dafc9d0bb154f@mail.gmail.com>
[not found] ` <alpine.DEB.1.00.0807101654080.18205@racer>
2008-07-10 16:12 ` [PATCH] tutorial: prefix the prompts with names alice or bob, to make it clear who is doing what Ian Katz
2008-07-10 16:45 ` Miklos Vajna
2008-07-10 18:27 ` Ian Katz
2008-07-10 21:01 ` [PATCH] tutorial: clarify "pull" is "fetch + merge" Junio C Hamano
2008-07-11 2:41 ` Jeff King [this message]
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=20080711024137.GA14967@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ifreecarve@gmail.com \
--cc=vmiklos@frugalware.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).