From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Apr 2013 19:28:02 GMT
Subject: Re: git rebase : knowing where I am...
Message-ID: <7v4nfembi5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7vvc7umey0.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

> Jeremy Rosen <jeremy.rosen@openwide.fr> writes:
>
>> 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 ?
>
> I do not think there is a "git $anything" command to do that, but in
> the meantime you could "cat .git/rebase-*/git-rebase-todo" or
> something.
>
> Recent trend is to teach "git status" more about these internal states,
> so with time the command may learn to include this in its output.

I actually often do this myself, not "cat anything" as I mentioned
above:

	git show-branch $branch_I_am_rebasing HEAD