mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source
This commit is contained in:
Junio C Hamano
2012-11-27 13:29:08 -08:00
parent 77b598b438 86ef7b37f9
commit b7973fbbc3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/git-push.txt
View File

@ -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 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 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. commit X to point at commit A. It is a fast-forward.