git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: git merge and merge message

From
XMXavier Maillard <zedek@gnu.org>
Date
Mar 11, 2007, 18:15 UTC
Message-ID
<200703111815.l2BIFHbq010315@localhost.localdomain>
In-Reply-To
<20070311160424.GA629@fieldses.org>
   From: "J. Bruce Fields" <bfields@fieldses.org>
   On Sun, Mar 11, 2007 at 04:05:04PM +0100, Xavier Maillard wrote:
   > The merge is correct but there is not merge message when I do a
   > git log.
   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.

No I did not touch master before. It could explain that behaviour then :)

I am still in my baby-learn phase but git really rocks (I am still lost with branches and tags but I am trying hard to understand.).

Thank you.
-- 
Xavier
Previous: J. Bruce FieldsNext: Linus Torvalds
Message 4 of 15 in “git merge and merge message”
  1. Xavier MaillardMar 11, 2007
  2. J. Bruce FieldsMar 11, 2007
  3. git-merge: warn when -m provided on a fast forwardJ. Bruce Fields, Mar 11, 2007
  4. Xavier MaillardMar 11, 2007
  5. Linus TorvaldsMar 11, 2007
  6. Avi KivityMar 11, 2007
  7. Linus TorvaldsMar 11, 2007
  8. Avi KivityMar 12, 2007
  9. Johannes SchindelinMar 11, 2007
  10. Junio C HamanoMar 12, 2007
  11. Avi KivityMar 12, 2007
  12. Junio C HamanoMar 11, 2007
  13. [RFC] git log --first-parentJunio C Hamano, Mar 13, 2007
  14. Jeff KingMar 13, 2007
  15. Martin LanghoffMar 12, 2007

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.