summaryrefslogtreecommitdiff
path: root/Documentation/glossary-content.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-27 21:37:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-27 21:37:21 (GMT)
commit11fbc0b1e1d5435f482af7bf391fd0d679955ba6 (patch)
tree7c4beeb7d7095f2fd3c30b012b6d8872e9db27ab /Documentation/glossary-content.txt
parentc0add3073a5bd0e295cdaea76e5c9b7805f8a047 (diff)
parent229177aaea295a3f804f98494d7bcde9c088fc0a (diff)
downloadgit-11fbc0b1e1d5435f482af7bf391fd0d679955ba6.zip
git-11fbc0b1e1d5435f482af7bf391fd0d679955ba6.tar.gz
git-11fbc0b1e1d5435f482af7bf391fd0d679955ba6.tar.bz2
Merge branch 'jh/checkout-auto-tracking' into maint
* jh/checkout-auto-tracking: glossary: Update and rephrase the definition of a remote-tracking branch branch.c: Validate tracking branches with refspecs instead of refs/remotes/* t9114.2: Don't use --track option against "svn-remote"-tracking branches t7201.24: Add refspec to keep --track working t3200.39: tracking setup should fail if there is no matching refspec. checkout: Use remote refspecs when DWIMming tracking branches t2024: Show failure to use refspec when DWIMming remote branch names t2024: Add tests verifying current DWIM behavior of 'git checkout <branch>'
Diffstat (limited to 'Documentation/glossary-content.txt')
-rw-r--r--Documentation/glossary-content.txt13
1 files changed, 7 insertions, 6 deletions
diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt
index 68a18e1..db2a74d 100644
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@ -400,12 +400,13 @@ should not be combined with other pathspec.
<<def_ref,ref>> and local ref.
[[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