diff options
| author | Matthieu Moy <Matthieu.Moy@imag.fr> | 2008-03-03 18:52:49 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-03 13:40:15 -0800 |
| commit | 81646ad247955a8343b58f05f12157dacabe1e5e (patch) | |
| tree | 3fbf74d61197648ff1259f051db267a57884e4c8 | |
| parent | e6d1f76ccf9de037c5479acdd9b6211e80145142 (diff) | |
| download | git-81646ad247955a8343b58f05f12157dacabe1e5e.tar.gz git-81646ad247955a8343b58f05f12157dacabe1e5e.tar.xz | |
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>
| -rw-r--r-- | Documentation/git-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 0c9ad7f2b..c136b1069 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -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. |