Re: git merge and merge message

From: J. Bruce Fields <bfields@fieldses.org>
Date: Mar 11, 2007, 16:04 UTC
Message-ID: <20070311160424.GA629@fieldses.org>
In-Reply-To: <200703111505.l2BF54Kq006625@localhost.localdomain>

On Sun, Mar 11, 2007 at 04:05:04PM +0100, Xavier Maillard wrote:

Show 19 quoted lines

> Hi,
> 
> I have setup several 'topic branches' for a project I am
> maintaining.
> 
> For several ones, I want to merge them into master.
> 
> Here is what I am trying to use:
> 
> git checkout master
> git merge -m "Message" topic-branch
> 
> The merge is correct but there is not merge message when I do a
> git log.
> 
> I have tried either with and without -m, I even tried with git
> merge "merge message" topic-branch but then it failed.
> 
> What is the correct way to have merge message ?

Have you done any work on the master branch since you branched the topic branch off from it? If not, the merge is just a "fast forward"--no merge commit is created, and instead the head of the master branch is just updated to point at the same commit as the head of the topic branch.

(Maybe git-merge could warn in the case of -m provided with a fast-forward?)

--b.