Merge branch 'maint'

2012-11-27 13:29:08 -08:00 · 2012-11-27 13:29:08 -08:00 · b7973fbbc3
commit b7973fbbc3
parent 77b598b438 86ef7b37f9
1 changed files with 2 additions and 1 deletions
--- 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.