Merge branch 'master' into ph/strbuf

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 665f6dc709207725daa9e7dd81d150a9aac0f7cb..7b8e075c422ba8065e746a8bb771267c4aca1d24 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -79,7 +79,7 @@ the remote repository.
 
 -f, \--force::
        Usually, the command refuses to update a remote ref that is
-       not a descendant of the local ref used to overwrite it.
+       not an ancestor of the local ref used to overwrite it.
        This flag disables the check.  This can cause the
        remote repository to lose commits; use it with care.
 
@@ -95,7 +95,7 @@ the remote repository.
 -v::
        Run verbosely.
 
-include::urls.txt[]
+include::urls-remotes.txt[]
 
 
 Examples
@@ -117,6 +117,12 @@ git push origin master:satellite/master::
        the ref that matches `satellite/master` (most likely, it would
        be `refs/remotes/satellite/master`) in `origin` repository with it.
 
+git push origin master:refs/heads/experimental::
+       Create the branch `experimental` in the `origin` repository
+       by copying the current `master` branch.  This form is usually
+       needed to create a new branch in the remote repository as
+       there is no `experimental` branch to match.
+
 Author
 ------
 Written by Junio C Hamano <junkio@cox.net>, later rewritten in C