Re: [PATCH 16/31] rebase -i: support --stat
From: Johannes Schindelin <hidden>
Date: 2016-06-15 22:50:18
Hi, On Tue, 28 Dec 2010, Martin von Zweigbergk wrote:
quoted hunk ↗ jump to hunk
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