Merge branches 'jc/daemon' and 'mw/http'

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 365cfd4105870892306b6376de768b2f0d4b97a3..a0ef61dafae3e105751e40765c0cfaf79d90bc8f 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -35,10 +35,10 @@ include::pull-fetch-param.txt[]
        line.
 
 -f, \--force::
-       Usually, the command refuses to update a local ref that is
-       not an ancestor of the remote ref used to overwrite it.
-       This flag disables the check.  What this means is that the
-       local repository can lose commits; use it with care.
+       Usually, the command refuses to update a remote ref that is
+       not a descendent 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.
 
 
 Author