From: Matthieu Moy Date: Tue, 02 Nov 2010 20:32:41 GMT Subject: [PATCH] Forgotten 'tracking' -> 'remote-tracking' Message-ID: <1288729961-23827-1-git-send-email-Matthieu.Moy@imag.fr> In-Reply-To: Signed-off-by: Matthieu Moy --- > You missed a tracking branch -> remote-tracking branch substitution in > the third/fourth line. Oops, right. Junio, can you either add this or (better) squash this in my PATCH 5/10? Thanks, Documentation/glossary-content.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index ba96b32..f04b48e 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -351,7 +351,7 @@ This commit is referred to as a "merge commit", or sometimes just a [[def_remote_tracking_branch]]remote-tracking branch:: A regular git <> that is used to follow changes from - another <>. A tracking + another <>. A remote-tracking branch should not contain direct modifications or have local commits made to it. A remote-tracking branch can usually be identified as the right-hand-side <> in a Pull: -- 1.7.3.2.183.g2e7b0