From: Jeff King <peff@peff.net>
Date: Sun, 4 Nov 2012 12:59:57 +0000 (-0500)
Subject: Merge branch 'mm/maint-doc-remote-tracking'
X-Git-Tag: v1.8.1-rc0~92
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6d3f2906a099cbde67e5084c80c8b5e6cf16e024?ds=inline;hp=-c

Merge branch 'mm/maint-doc-remote-tracking'

We long ago hyphenated "remote-tracking branch"; this
catches some new instances added since then.

* mm/maint-doc-remote-tracking:
Documentation: remote tracking branch -> remote-tracking branch
---

6d3f2906a099cbde67e5084c80c8b5e6cf16e024
diff --combined Documentation/git-push.txt
index 22d2580129,7938314b69..fe46c4258a
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -37,9 -37,7 +37,9 @@@ OPTIONS[[OPTIONS]
  	`+`, followed by the source ref <src>, followed
  	by a colon `:`, followed by the destination ref <dst>.
  	It is used to specify with what <src> object the <dst> ref
 -	in the remote repository is to be updated.
 +	in the remote repository is to be updated.  If not specified,
 +	the behavior of the command is controlled by the `push.default`
 +	configuration variable.
  +
  The <src> is often the name of the branch you would want to push, but
  it can be any arbitrary "SHA-1 expression", such as `master~4` or
@@@ -67,8 -65,7 +67,8 @@@ directs git to push "matching" branches
  the local side, the remote side is updated if a branch of the same name
  already exists on the remote side.  This is the default operation mode
  if no explicit refspec is found (that is neither on the command line
 -nor in any Push line of the corresponding remotes file---see below).
 +nor in any Push line of the corresponding remotes file---see below) and
 +no `push.default` configuration variable is set.
  
  --all::
  	Instead of naming each ref to push, specifies that all
@@@ -175,7 -172,7 +175,7 @@@ useful if you write an alias or script 
  
  --recurse-submodules=check|on-demand::
  	Make sure all submodule commits used by the revisions to be
- 	pushed are available on a remote tracking branch. If 'check' is
+ 	pushed are available on a remote-tracking branch. If 'check' is
  	used git will verify that all submodule commits that changed in
  	the revisions to be pushed are available on at least one remote
  	of the submodule. If any commits are missing the push will be
@@@ -360,8 -357,7 +360,8 @@@ Example
  	`git push origin :`.
  +
  The default behavior of this command when no <refspec> is given can be
 -configured by setting the `push` option of the remote.
 +configured by setting the `push` option of the remote, or the `push.default`
 +configuration variable.
  +
  For example, to default to pushing only the current branch to `origin`
  use `git config remote.origin.push HEAD`.  Any valid <refspec> (like