[PATCH] Forgotten 'tracking' -> 'remote-tracking'
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
> 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 <<def_branch,branch>> that is used to follow changes from
- another <<def_repository,repository>>. A tracking
+ another <<def_repository,repository>>. 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 <<def_ref,ref>> in a Pull:
--
1.7.3.2.183.g2e7b0
Matthieu Moy <matthieu.moy@imag.fr>