undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fetch doc: update note on '+' in front of the refspec

Browse Source 
While it is not *wrong* per-se to say that pulling a rewound/rebased
branch will lead to an unnecessary merge conflict, that is not what
the leading "+" sign to allow non-fast-forward update of remote-tracking
branch is at all.

Helped-by: Marc Branchaud <marcnarc@xiplink.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Junio C Hamano 2014-05-29 12:53:28 -07:00
parent 366a0184e5
commit f471dbc5fe
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Documentation/pull-fetch-param.txt
View File

@ -24,15 +24,15 @@ is updated even if it does not result in a fast-forward
update. update.
+ +
[NOTE] [NOTE]
If the remote branch from which you want to pull is When the remote branch you want to fetch is known to
modified in non-linear ways such as being rewound and be rewound and rebased regularly, it is expected that
rebased frequently, then a pull will attempt a merge with its new tip will not be descendant of its previous tip
an older version of itself, likely conflict, and fail. (as stored in your remote-tracking branch the last time
It is under these conditions that you would want to use you fetched). You would want
the `+` sign to indicate non-fast-forward updates will to use the `+` sign to indicate non-fast-forward updates
be needed. There is currently no easy way to determine will be needed for such branches. There is no way to
or declare that a branch will be made available in a determine or declare that a branch will be made available
repository with this behavior; the pulling user simply in a repository with this behavior; the pulling user simply
must know this is the expected usage pattern for a branch. must know this is the expected usage pattern for a branch.
+ +
[NOTE] [NOTE]