From: Alex Riesen <raa.lkml@gmail.com>
Date: Wed, 28 Oct 2009 15:43:53 GMT
Subject: Re: merge confusion
Message-ID: <81b0412b0910280843s53af2033y7e24400dca231385@mail.gmail.com>
In-Reply-To: <26093419.post@talk.nabble.com>

On Wed, Oct 28, 2009 at 13:01, Tim Mazid <timmazid@hotmail.com> wrote:
> You can just do a 'git branch branch-to-merge COMMIT' then 'git merge
> branch-to-merge' from your feature branch. Alternatively, you could just do
> a straight 'git merge COMMIT' from your feature branch. Though I'm not sure
> of the consequences of merging a commit instead of a branch.

The only consequence is that the merge commit message (if there will be any,
fast-forward merges don't merge anything) will mention the SHA1 instead of
branch name. You can provide your own merge commit message, of course
(while merging and afterwards).