On Wed, Apr 10, 2013 at 4:40 PM, Jeremy Rosen <jeremy.ro...@openwide.fr> wrote:
> is there some way to know how far you are within a rebase when the rebase is
> interupted by a conflict other than the message given by git rebase when it
> was interrupted ?
$ cat .git/rebase-merge/done
p 3b465bd foo2 1
e 03f8bea foo2 2
e 0871817 foo2 1
last line is the current commit being edited/under conflict/etc.
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html