git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCHv2 8/8] glossary: Update and rephrase the definition of a remote-tracking branch

From
Johan Herland <johan@herland.net>
Date
Apr 20, 2013, 15:06 UTC
Message-ID
<1366470363-22309-9-git-send-email-johan@herland.net>
In-Reply-To
<1366470363-22309-1-git-send-email-johan@herland.net>

The definition of a remote-tracking branch in the glossary have been out-of-date for a while (by e.g. referring to "Pull:" from old-style $GIT_DIR/remotes files).

Also, the preceding patches have formalized that a remote-tracking branch must match a configured refspec in order to be usable as an upstream.

This patch rewrites the paragraph on remote-tracking branches accordingly.
Signed-off-by: Johan Herland <johan@herland.net>
---
 Documentation/glossary-content.txt | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 2478a39..7a79f26 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -423,12 +423,13 @@ should not be combined with other pathspec.
 	linkgit:git-push[1].
 
 [[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 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:
-	<<def_refspec,refspec>>.
+	A <<def_ref,ref>> that is used to follow changes from another
+	<<def_repository,repository>>. It typically looks like
+	'refs/remotes/foo/bar' (indicating that it tracks a branch named
+	'bar' in a remote named 'foo'), and matches the right-hand-side of
+	a configured fetch <<def_refspec,refspec>>. A remote-tracking
+	branch should not contain direct modifications or have local
+	commits made to it.
 
 [[def_repository]]repository::
 	A collection of <<def_ref,refs>> together with an

-- 
1.8.1.3.704.g33f7d4f
Previous: Johan Herland
Message 12 of 12 in “[PATCHv2 0/8] Improving the search for remote-tracking branches”
  1. Johan HerlandApr 20, 2013
  2. 1/8 t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'Johan Herland, Apr 20, 2013
  3. Jonathan NiederApr 20, 2013
  4. Johan HerlandApr 20, 2013
  5. 2/8 t2024: Show failure to use refspec when DWIMming remote branch namesJohan Herland, Apr 20, 2013
  6. 3/8 checkout: Use remote refspecs when DWIMming tracking branchesJohan Herland, Apr 20, 2013
  7. 4/8 t3200.39: tracking setup should fail if there is no matching refspec.Johan Herland, Apr 20, 2013
  8. 5/8 t7201.24: Add refspec to keep --track workingJohan Herland, Apr 20, 2013
  9. 6/8 t9114.2: Don't use --track option against "svn-remote"-tracking branchesJohan Herland, Apr 20, 2013
  10. Eric WongApr 21, 2013
  11. 7/8 branch.c: Validate tracking branches with refspecs instead of refs/remotes/*Johan Herland, Apr 20, 2013
  12. 8/8 glossary: Update and rephrase the definition of a remote-tracking branchJohan Herland, Apr 20, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.