Re: git fetch: where are the downloaded objects stored?

From

Matthieu Moy <matthieu.moy@imag.fr>

Date

Mar 3, 2008, 15:21 UTC

Message-ID

<vpq63w325px.fsf@bauges.imag.fr>

In-Reply-To

<4d8e3fd30803030633nf6266d5qab0df4ba4c539e0b@mail.gmail.com>

"Paolo Ciarrocchi" <paolo.ciarrocchi@gmail.com> writes:

> "A merge is always between the current HEAD and one or more remote
> branch heads"

I think this is just wrong. Would this be correct?

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 0c9ad7f..e46dea1 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -68,7 +68,7 @@ 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
+branch heads (remote or local), 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.

-- 
Matthieu