From: Jeff King <peff@peff.net>
Date: Thu, 25 Oct 2012 09:54:27 GMT
Subject: Re: [PATCH] Documentation: remote tracking branch -> remote-tracking branch
Message-ID: <20121025095427.GL8390@sigill.intra.peff.net>
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