From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: Nicolas Pitre <nico@cam.org>
Cc: git@vger.kernel.org, gitster@pobox.com
Subject: Re: [PATCH] Fix incorrect wording in git-merge.txt.
Date: Mon, 03 Mar 2008 20:50:39 +0100 [thread overview]
Message-ID: <vpqlk4zoacw.fsf@bauges.imag.fr> (raw)
In-Reply-To: <alpine.LFD.1.00.0803031320180.2899@xanadu.home> (Nicolas Pitre's message of "Mon\, 03 Mar 2008 13\:26\:42 -0500 \(EST\)")
Nicolas Pitre <nico@cam.org> writes:
> You don't really merge a commit _object_.
> You merge with one or more other commits, tipycally identified by a
> branch name or a tag.
Strictly speaking, you can merge any commit, not necessarily a branch
or a tag. That can be "git merge 66f0a4d" or whatever. Admitedly, the
common case is to merge a tag or a branch (which is why I keep it in
parentheses).
Now, I don't understand the distinction you seem to be making between
"commit" and "commit object".
--
Matthieu
next prev parent reply other threads:[~2008-03-03 19:53 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-03 17:14 [PATCH] Fix incorrect wording in git-merge.txt Matthieu Moy
2008-03-03 17:27 ` Junio C Hamano
2008-03-03 17:52 ` Matthieu Moy
2008-03-03 18:26 ` Nicolas Pitre
2008-03-03 19:50 ` Matthieu Moy [this message]
2008-03-03 20:39 ` Nicolas Pitre
2008-03-03 21:25 ` Matthieu Moy
2008-03-03 22:10 ` Nicolas Pitre
2008-03-11 7:05 ` Andreas Ericsson
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=vpqlk4zoacw.fsf@bauges.imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=nico@cam.org \
/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.