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

Re: [BUG] git-merge-octopus creates an empty merge commit with one parent

From
Junio C Hamano <gitster@pobox.com>
Date
Feb 13, 2012, 18:48 UTC
Message-ID
<7vipjafu27.fsf@alter.siamese.dyndns.org>
In-Reply-To
<1329133736-20817-1-git-send-email-michal.kiedrowicz@gmail.com>
Michał Kiedrowicz <michal.kiedrowicz@gmail.com> writes:
> This happens when git merge is run to merge multiple commits that are
> descendants of current HEAD (or are HEAD).
I am reasonably sure you meant ancestors here.
> to origin/master but accidentaly we called (while being on master):
>
> 	$ git merge master origin/master
I am very tempted to throw this into "don't do it then" category.
Previous: Michał KiedrowiczNext: Michał Kiedrowicz
Message 2 of 5 in “[BUG] git-merge-octopus creates an empty merge commit with one parent”
  1. Michał KiedrowiczFeb 13, 2012
  2. Junio C HamanoFeb 13, 2012
  3. Michał KiedrowiczFeb 13, 2012
  4. Junio C HamanoFeb 13, 2012
  5. Michał KiedrowiczFeb 13, 2012

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.