git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Xavier Maillard <zedek@gnu.org>
To: git@vger.kernel.org
Subject: git merge and merge message
Date: Sun, 11 Mar 2007 16:05:04 +0100	[thread overview]
Message-ID: <200703111505.l2BF54Kq006625@localhost.localdomain> (raw)

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 ?

Thank you
-- 
Xavier

             reply	other threads:[~2007-03-11 15:07 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-03-11 15:05 Xavier Maillard [this message]
2007-03-11 16:04 ` git merge and merge message J. Bruce Fields
2007-03-11 16:28   ` [PATCH] git-merge: warn when -m provided on a fast forward J. Bruce Fields
2007-03-11 18:15   ` git merge and merge message Xavier Maillard
2007-03-11 20:19     ` Linus Torvalds
2007-03-11 20:31       ` Avi Kivity
2007-03-11 21:05         ` Linus Torvalds
2007-03-12 17:26           ` Avi Kivity
2007-03-11 21:41         ` Johannes Schindelin
2007-03-12  2:03           ` Junio C Hamano
2007-03-12 17:31           ` Avi Kivity
2007-03-11 20:56       ` Junio C Hamano
2007-03-13  8:55         ` [RFC] git log --first-parent Junio C Hamano
2007-03-13 14:17           ` Jeff King
2007-03-12  3:07       ` git merge and merge message Martin Langhoff

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=200703111505.l2BF54Kq006625@localhost.localdomain \
    --to=zedek@gnu.org \
    --cc=git@vger.kernel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).