From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org, gitster@pobox.com
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [PATCH] Forgotten 'tracking' -> 'remote-tracking'
Date: Tue, 2 Nov 2010 21:32:41 +0100 [thread overview]
Message-ID: <1288729961-23827-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
In-Reply-To: <AANLkTinwdDJKQMPx=Z_F7H9Nj=m0MYjQ8SnOjPV2J5x1@mail.gmail.com>
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
next prev parent reply other threads:[~2010-11-02 20:33 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-02 15:31 [PATCH 00/10 v4] More consistant terminology Matthieu Moy
2010-11-02 15:31 ` [PATCH 01/10] Better "Changed but not updated" message in git-status Matthieu Moy
2010-11-02 15:31 ` [PATCH 02/10] Replace "remote tracking" with "remote-tracking" Matthieu Moy
2010-11-02 15:31 ` [PATCH 03/10] Change remote tracking to remote-tracking in non-trivial places Matthieu Moy
2010-11-02 15:31 ` [PATCH 04/10] everyday.txt: change "tracking branch" to "remote-tracking branch" Matthieu Moy
2010-11-02 15:31 ` [PATCH 05/10] Change " Matthieu Moy
2010-11-02 15:43 ` Santi Béjar
2010-11-02 20:32 ` Matthieu Moy [this message]
2010-11-02 15:31 ` [PATCH 06/10] Change incorrect uses of "remote branch" meaning "remote-tracking" Matthieu Moy
2010-11-02 15:31 ` [PATCH 07/10] Change incorrect "remote branch" to "remote tracking branch" in C code Matthieu Moy
2010-11-09 16:15 ` What's the -s switch in git show? Will Hall
2010-11-09 17:12 ` [PATCH] Documentation: document show -s Jonathan Nieder
2010-11-02 15:31 ` [PATCH 08/10] user-manual.txt: explain better the remote(-tracking) branch terms Matthieu Moy
2010-11-02 22:58 ` Peter Krefting
2010-11-02 21:06 ` [PATCH] " Matthieu Moy
2010-11-02 15:31 ` [PATCH 09/10] user-manual: remote-tracking can be checked out, with detached HEAD Matthieu Moy
2010-11-02 15:31 ` [PATCH 10/10] git-branch.txt: mention --set-upstream as a way to change upstream configuration Matthieu Moy
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=1288729961-23827-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--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).