On Tue, 28 Dec 2010, Johannes Schindelin wrote:

quoted text
> Hi,
> 
> On Tue, 28 Dec 2010, Martin von Zweigbergk wrote:
> 
> > diff --git a/git-rebase.sh b/git-rebase.sh
> > index 229e8d2..0fc580a 100755
> 
> Hmpf... After a rebasing merge to junio/next:
> 
> -- snip --
> [...]
> Applying: rebase -i: support --stat
> fatal: sha1 information is lacking or useless (git-rebase.sh).
> Repository lacks necessary blobs to fall back on 3-way merge.
> Cannot fall back to three-way merge.
> [...]
> -- snap --
> 
> Is this supposed to apply on top of junio/master, junio/next, junio/maint?

It is supposed to apply on top of junio/master. I tried exporting the
recevied emails using Alpine. This is the first time I do this, but I
managed to export them to one big file. I then applied it using 'git
am' onto a new branch created from junio/master and it was
successful. I'm very surprised that patch 16 failed for you if the
first 15 patches applied correctly.

I'm not sure what to use the hashes in the beginning of your mail for,
but I have verified that they match the hashes of git-rebase.sh before
and after patch 16 (in both my original branch and in the temporary
branch where I ran 'git am' on my own emails).


Regards,
Martin
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html