From: Junio C Hamano Date: Wed, 30 Jan 2013 23:39:04 GMT Subject: Re: "sha1 information is lacking or useless" when rebasing with a submodule pointer conflict Message-ID: <7v38xijl5z.fsf@alter.siamese.dyndns.org> In-Reply-To: <20130130224904.GB1053@book.hvoigt.net> Heiko Voigt writes: > Maybe Martin or Junio immediately see whats going wrong here? I would > need to further dig into the git-am code to find out how to fix it. "am -3" has never worked on a patch that describes changes to any non-blobs; the underlyihng "apply --fake-ancestor" is not prepared to see anything other than blobs.