From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Feb 2015 18:15:30 +0000 (-0800)
Subject: Merge branch 'mg/push-repo-option-doc'
X-Git-Tag: v2.4.0-rc0~115
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a1589043238d7390b453bec0015bc326c4ebcbe1?hp=-c

Merge branch 'mg/push-repo-option-doc'

The "git push" documentation made the "--repo=<there>" option
easily misunderstood.

* mg/push-repo-option-doc:
git-push.txt: document the behavior of --repo
---

a1589043238d7390b453bec0015bc326c4ebcbe1
diff --combined Documentation/git-push.txt
index ea9757692a,aea848a782..e1a46a7958
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@@ -9,9 -9,8 +9,9 @@@ git-push - Update remote refs along wit
  SYNOPSIS
  --------
  [verse]
 -'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
 -	   [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream]
 +'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
 +	   [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose]
 +	   [-u | --set-upstream] [--signed]
  	   [--force-with-lease[=<refname>[:<expect>]]]
  	   [--no-verify] [<repository> [<refspec>...]]
  
@@@ -34,7 -33,7 +34,7 @@@ When the command line does not specify 
  arguments or `--all`, `--mirror`, `--tags` options, the command finds
  the default `<refspec>` by consulting `remote.*.push` configuration,
  and if it is not found, honors `push.default` configuration to decide
 -what to push (See gitlink:git-config[1] for the meaning of `push.default`).
 +what to push (See linkgit:git-config[1] for the meaning of `push.default`).
  
  
  OPTIONS[[OPTIONS]]
@@@ -130,17 -129,6 +130,17 @@@ already exists on the remote side
  	from the remote but are pointing at commit-ish that are
  	reachable from the refs being pushed.
  
 +--signed::
 +	GPG-sign the push request to update refs on the receiving
 +	side, to allow it to be checked by the hooks and/or be
 +	logged.  See linkgit:git-receive-pack[1] for the details
 +	on the receiving end.
 +
 +--[no-]atomic::
 +	Use an atomic transaction on the remote side if available.
 +	Either all refs are updated, or on error, no refs are updated.
 +	If the server does not support atomic pushes the push will fail.
 +
  --receive-pack=<git-receive-pack>::
  --exec=<git-receive-pack>::
  	Path to the 'git-receive-pack' program on the remote
@@@ -219,22 -207,8 +219,8 @@@ origin +master` to force a push to the 
  `<refspec>...` section above for details.
  
  --repo=<repository>::
- 	This option is only relevant if no <repository> argument is
- 	passed in the invocation. In this case, 'git push' derives the
- 	remote name from the current branch: If it tracks a remote
- 	branch, then that remote repository is pushed to. Otherwise,
- 	the name "origin" is used. For this latter case, this option
- 	can be used to override the name "origin". In other words,
- 	the difference between these two commands
- +
- --------------------------
- git push public         #1
- git push --repo=public  #2
- --------------------------
- +
- is that #1 always pushes to "public" whereas #2 pushes to "public"
- only if the current branch does not track a remote branch. This is
- useful if you write an alias or script around 'git push'.
+ 	This option is equivalent to the <repository> argument. If both
+ 	are specified, the command-line argument takes precedence.
  
  -u::
  --set-upstream::