summaryrefslogtreecommitdiffstats
path: root/git-push.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-11-27 13:53:29 -0800
committerJunio C Hamano <gitster@pobox.com>2012-11-27 13:53:29 -0800
commit70e980e01bc36d4da977bf70b79fd3491df4a92d (patch)
tree61f1e0e9c2fcdc7870bdab1c11318c5b9219b816 /git-push.txt
parentb4e58b1998835dcb225ed4792557b23160608069 (diff)
downloadgit-htmldocs-70e980e01bc36d4da977bf70b79fd3491df4a92d.tar.gz
Autogenerated HTML docs for v1.8.0.1-250-gb797
Diffstat (limited to 'git-push.txt')
-rw-r--r--git-push.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-push.txt b/git-push.txt
index fe46c4258..6d19d59ce 100644
--- a/git-push.txt
+++ b/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.