Merge branch 'master'

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 7e9452efe1f82a34fb5d2e5eff847bd93a1260f6..5b891105b2f9b425db61ee778a7f49eabf3ebcc5 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -16,7 +16,7 @@ DESCRIPTION
 Updates remote refs using local refs, while sending objects
 necessary to complete the given refs.
 
-You can make "interesting" things to happen on the repository
+You can make interesting things happen to a repository
 every time you push into it, by setting up 'hooks' there.  See
 documentation for gitlink:git-receive-pack[1].
 
@@ -24,8 +24,8 @@ documentation for gitlink:git-receive-pack[1].
 OPTIONS
 -------
 <repository>::
-       The "remote" repository that is destination of a push operation.
-include::urls.txt[]
+       The "remote" repository that is destination of a push
+       operation.  See the section <<URLS,GIT URLS>> below.
 
 <refspec>::
        The canonical format of a <refspec> parameter is
@@ -51,8 +51,8 @@ Some short-cut notations are also supported.
   in the source.
 
 \--all::
-       Instead of naming each ref to push, specifies all refs
-       to be pushed.
+       Instead of naming each ref to push, specifies that all
+       refs be pushed.
 
 \--tags::
        All refs under `$GIT_DIR/refs/tags` are pushed, in
@@ -65,6 +65,7 @@ Some short-cut notations are also supported.
        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 
+include::urls.txt[]
 
 Author
 ------