From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 18:48:48 GMT
Subject: Re: [BUG] git-merge-octopus creates an empty merge commit with one parent
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.