Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

[git.git] / Documentation / git-push.txt

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 665f6dc709207725daa9e7dd81d150a9aac0f7cb..0dd9caf86799e1648fde8895af918f6f4806d202 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