Merge branch 'maint'

diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index fe46c4258a9c8a9dbab0b789215716065bef00ad..6d19d59ce5a3a683c1af3b0541a5746faba116f9 100644 (file)
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -286,7 +286,8 @@ leading to commit A.  The history looks like this:
 ----------------
 
 Further suppose that the other person already pushed changes leading to A
-back to the original repository you two obtained the original commit X.
+back to the original repository from which you two obtained the original
+commit X.
 
 The push done by the other person updated the branch that used to point at
 commit X to point at commit A.  It is a fast-forward.