Merge branch 'ph/push-doc-cas'

* ph/push-doc-cas:
git-push.txt: clean up force-with-lease wording

diff --combined Documentation/git-push.txt
index 5171086181f86b995f89ddc68de94bd2359561a3,29508a74df5f37c2f7469a041e3cacafae9d74aa..863c30c4c2d0fd78ee81d219ed221cb248ce1994
--- 1/Documentation/git-push.txt
--- 2/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]]
@@@ -128,21 -127,7 +128,21 @@@ already exists on the remote side
        Push all the refs that would be pushed without this option,
        and also push annotated tags in `refs/tags` that are missing
        from the remote but are pointing at commit-ish that are
 -      reachable from the refs being pushed.
 +      reachable from the refs being pushed.  This can also be specified
 +      with configuration variable 'push.followTags'.  For more
 +      information, see 'push.followTags' in linkgit:git-config[1].
 +
 +
 +--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>::
@@@ -157,9 -142,8 +157,8 @@@
        Usually, "git push" refuses to update a remote ref that is
        not an ancestor of the local ref used to overwrite it.
  +
- This option bypasses the check, but instead requires that the
- current value of the ref to be the expected value.  "git push"
- fails otherwise.
+ This option overrides this restriction if the current value of the
+ remote ref is the expected value.  "git push" fails otherwise.
  +
  Imagine that you have to rebase what you have already published.
  You will have to bypass the "must fast-forward" rule in order to
@@@ -171,15 -155,14 +170,14 @@@ commit, and blindly pushing with `--for
  This option allows you to say that you expect the history you are
  updating is what you rebased and want to replace. If the remote ref
  still points at the commit you specified, you can be sure that no
- other people did anything to the ref (it is like taking a "lease" on
- the ref without explicitly locking it, and you update the ref while
- making sure that your earlier "lease" is still valid).
+ other people did anything to the ref. It is like taking a "lease" on
+ the ref without explicitly locking it, and the remote ref is updated
+ only if the "lease" is still valid.
  +
  `--force-with-lease` alone, without specifying the details, will protect
  all remote refs that are going to be updated by requiring their
  current value to be the same as the remote-tracking branch we have
- for them, unless specified with a `--force-with-lease=<refname>:<expect>`
- option that explicitly states what the expected value is.
+ for them.
  +
  `--force-with-lease=<refname>`, without specifying the expected value, will
  protect the named ref (alone), if it is going to be updated, by
@@@ -222,8 -205,22 +220,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::