From: Tay Ray Chuan <rctay89@gmail.com>
Date: Thu, 11 Apr 2013 07:45:38 GMT
Subject: Re: git rebase : knowing where I am...
Message-ID: <CALUzUxrkt-7svY83FFnn23Xk0bTp=vW3OiFB8xq_Aw_0AcV_Mw@mail.gmail.com>
In-Reply-To: <1124759476.1420642.1365583233806.JavaMail.root@openwide.fr>

On Wed, Apr 10, 2013 at 4:40 PM, Jeremy Rosen <jeremy.rosen@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 ?

How about

  $ cat .git/rebase-merge/done

sample output:

  p 3b465bd foo2 1
  e 03f8bea foo2 2
  e 0871817 foo2 1

last line is the current commit being edited/under conflict/etc.

--
Cheers,
Ray Chuan