diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-11-27 13:29:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-27 13:29:08 -0800 |
| commit | b7973fbbc3f8f72df352f4ef1a2ff325db92c36f (patch) | |
| tree | ef64c2b4be6232c965129030a63492a96e823d27 | |
| parent | Merge branch 'maint' (diff) | |
| parent | Merge branch 'nd/maint-compat-fnmatch-fix' into maint (diff) | |
| download | git-b7973fbbc3f8f72df352f4ef1a2ff325db92c36f.tar.gz git-b7973fbbc3f8f72df352f4ef1a2ff325db92c36f.zip | |
Merge branch 'maint'
| -rw-r--r-- | Documentation/git-push.txt | 3 |
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. |