Re: git-am failed, what's next ?

Junio C Hamano wrote:

	$ git am -3

This can result in one of three things:

 * It can complain, with "Patch does not record usable index
   information".  When this happens, you are back to square-one.
   Your repository does not have enough blobs for it to fall
   back on 3-way merge.  The operation did not change anything
   in your working tree nor what are in .dotest/ directory, so
   it did not do any further harm.  You have to use one of the
   two strategies described above instead.

BTW, in this case I got the following error message:

fatal: sha1 information is lacking or useless (foo).
Patch does not record usable index information.
Cannot fall back to three-way merge.
Patch failed at 0001.

which is hard to understand, whereas your explanation:

Your repository does not have enough blobs for it to fall
back on 3-way merge.

sounds better and easier to understand to me...
-- 
Francis