From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 27 Jun 2013 21:37:21 +0000 (-0700)
Subject: Merge branch 'jh/checkout-auto-tracking' into maint
X-Git-Tag: v1.8.3.2~16
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/11fbc0b1e1d5435f482af7bf391fd0d679955ba6

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>'
---

11fbc0b1e1d5435f482af7bf391fd0d679955ba6
diff --cc Documentation/glossary-content.txt
index 68a18e1497,7a79f26231..db2a74df93
--- a/Documentation/glossary-content.txt
+++ b/Documentation/glossary-content.txt
@@@ -397,15 -412,24 +397,16 @@@ should not be combined with other paths
  [[def_refspec]]refspec::
  	A "refspec" is used by <<def_fetch,fetch>> and
  	<<def_push,push>> to describe the mapping between remote
 -	<<def_ref,ref>> and local ref. They are combined with a colon in
 -	the format <src>:<dst>, preceded by an optional plus sign, +.
 -	For example: `git fetch $URL
 -	refs/heads/master:refs/heads/origin` means "grab the master
 -	<<def_branch,branch>> <<def_head,head>> from the $URL and store
 -	it as my origin branch head". And `git push
 -	$URL refs/heads/master:refs/heads/to-upstream` means "publish my
 -	master branch head as to-upstream branch at $URL". See also
 -	linkgit:git-push[1].
 +	<<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