From: Matthieu Moy <matthieu.moy@imag.fr>
Date: Mon, 03 Mar 2008 19:50:39 GMT
Subject: Re: [PATCH] Fix incorrect wording in git-merge.txt.
Message-ID: <vpqlk4zoacw.fsf@bauges.imag.fr>
In-Reply-To: <alpine.LFD.1.00.0803031320180.2899@xanadu.home>

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