Michał Kiedrowicz <michal.kiedrowicz@xxxxxxxxx> 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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html