From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 28 Dec 2010 17:59:46 GMT
Subject: Re: [PATCH 16/31] rebase -i: support --stat
Message-ID: <alpine.DEB.1.00.1012281858300.1794@bonsai2>
In-Reply-To: <1293528648-21873-17-git-send-email-martin.von.zweigbergk@gmail.com>

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?

Ciao,
Dscho