summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Mark Szepieniec <mszepien@gmail.com>2012-11-27 01:37:34 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-11-27 09:12:58 -0800
commit6b6e063c44dd830bf9d146a91a7df51c0af94f23 (patch)
treef93705ae2168b7268ee82da9b98763b49a42a2cd
parentFix typo in remote set-head usage (diff)
downloadtgif-6b6e063c44dd830bf9d146a91a7df51c0af94f23.tar.xz
Documentation: improve phrasing in git-push.txt
The current version contains the sentence: Further suppose that the other person already pushed changes leading to A back to the original repository you two obtained the original commit X. which doesn't parse for me; I've changed it to Further suppose that the other person already pushed changes leading to A back to the original repository from which you two obtained the original commit X. Signed-off-by: Mark Szepieniec <mszepien@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--Documentation/git-push.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index fe46c4258a..6d19d59ce5 100644
--- 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.