All of lore.kernel.org
 help / color / mirror / Atom feed
From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: "Paolo Ciarrocchi" <paolo.ciarrocchi@gmail.com>
Cc: "Git Mailing List" <git@vger.kernel.org>
Subject: Re: git fetch: where are the downloaded objects stored?
Date: Mon, 03 Mar 2008 16:21:46 +0100	[thread overview]
Message-ID: <vpq63w325px.fsf@bauges.imag.fr> (raw)
In-Reply-To: <4d8e3fd30803030633nf6266d5qab0df4ba4c539e0b@mail.gmail.com> (Paolo Ciarrocchi's message of "Mon\, 3 Mar 2008 15\:33\:23 +0100")

"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

  reply	other threads:[~2008-03-03 15:23 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-03 12:40 git fetch: where are the downloaded objects stored? Paolo Ciarrocchi
2008-03-03 13:14 ` Matthieu Moy
2008-03-03 14:33   ` Paolo Ciarrocchi
2008-03-03 15:21     ` Matthieu Moy [this message]
2008-03-03 15:40       ` Paolo Ciarrocchi
2008-03-03 16:29         ` Nicolas Pitre
2008-03-03 16:51           ` Paolo Ciarrocchi
2008-03-03 17:18             ` Sergei Organov
2008-03-03 18:14               ` Nicolas Pitre
2008-03-03 18:07             ` Nicolas Pitre
2008-03-03 19:43               ` Paolo Ciarrocchi
2008-03-03 16:59     ` Jakub Narebski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=vpq63w325px.fsf@bauges.imag.fr \
    --to=matthieu.moy@imag.fr \
    --cc=git@vger.kernel.org \
    --cc=paolo.ciarrocchi@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.