mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Fix incorrect wording in git-merge.txt.
A merge is not necessarily with a remote branch, it can be with any commit. Thanks to Paolo Ciarrocchi for pointing out the problem, and to Nicolas Pitre for pointing out the fact that a merge is not necessarily with a branch head. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
e6d1f76ccf
commit
81646ad247
|
@ -68,7 +68,8 @@ HOW MERGE WORKS
|
|||
---------------
|
||||
|
||||
A merge is always between the current `HEAD` and one or more
|
||||
remote branch heads, and the index file must exactly match the
|
||||
commits (usually, branch head or tag), and the index file must
|
||||
exactly match the
|
||||
tree of `HEAD` commit (i.e. the contents of the last commit) when
|
||||
it happens. In other words, `git-diff --cached HEAD` must
|
||||
report no changes.
|
||||
|
|
Loading…
Reference in a new issue