From: Jeff King <peff@peff.net>
To: Matthieu Moy <Matthieu.Moy@imag.fr>
Cc: git@vger.kernel.org, gitster@pobox.com, angelo.borsotti@gmail.com
Subject: Re: [PATCH] Documentation: remote tracking branch -> remote-tracking branch
Date: Thu, 25 Oct 2012 05:54:27 -0400 [thread overview]
Message-ID: <20121025095427.GL8390@sigill.intra.peff.net> (raw)
In-Reply-To: <1350992045-11141-1-git-send-email-Matthieu.Moy@imag.fr>
On Tue, Oct 23, 2012 at 01:34:05PM +0200, Matthieu Moy wrote:
> This change was already done by 0e615b252f3 (Matthieu Moy, Tue Nov 2
> 2010, Replace "remote tracking" with "remote-tracking"), but new
> instances of remote tracking (without dash) were introduced in the
> meantime.
Thanks. It seems like an obvious step forward.
> I'm not opposed to dropping completely the remote-tracking part in the
> case of merge (i.e. "remote-tracking branches that the current branch
> is configured to use as its upstream" -> "upstream branch") on top of
> that, but if we do this, merge-config.txt should be updated too).
Yeah, I do not care too deeply, but I think it reads just fine without
mentioning remote-tracking at all.
-Peff
prev parent reply other threads:[~2012-10-25 9:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-23 7:40 git merge man page, upstream Angelo Borsotti
2012-10-23 7:51 ` Matthieu Moy
2012-10-23 9:07 ` Angelo Borsotti
2012-10-23 11:35 ` Matthieu Moy
2012-10-23 17:30 ` Angelo Borsotti
2012-10-23 11:34 ` [PATCH] Documentation: remote tracking branch -> remote-tracking branch Matthieu Moy
2012-10-25 9:54 ` 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=20121025095427.GL8390@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Matthieu.Moy@imag.fr \
--cc=angelo.borsotti@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;
as well as URLs for NNTP newsgroup(s).