threads / discuss / 33456

git rebase : knowing where I am...

Subject: git rebase : knowing where I am...

## tl;dr

4 messages between Apr 10, 2013 and Apr 11, 2013.

replies: 3people: 3as markdown or json

Jeremy Rosen· Apr 10, 2013, 08:40 UTC · lore

Hello

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 would have expected a git rebase --status or something similar...

    Regards

    Jérémy Rosen

fight key loggers : write some perl using vim

Junio C Hamano· Apr 10, 2013, 18:13 UTC · re: Jeremy Rosen · lore

Re: git rebase : knowing where I am...

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.

Junio C Hamano· Apr 10, 2013, 19:28 UTC · re: Junio C Hamano · lore

Re: git rebase : knowing where I am...

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

Show 12 quoted lines

> 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

Tay Ray Chuan· Apr 11, 2013, 07:45 UTC · re: Jeremy Rosen · lore

Re: git rebase : knowing where I am...

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