* git rebase : knowing where I am...
@ 2013-04-10 8:40 Jeremy Rosen
2013-04-10 18:13 ` Junio C Hamano
2013-04-11 7:45 ` Tay Ray Chuan
0 siblings, 2 replies; 4+ messages in thread
From: Jeremy Rosen @ 2013-04-10 8:40 UTC (permalink / raw)
To: Git List
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git rebase : knowing where I am...
2013-04-10 8:40 git rebase : knowing where I am Jeremy Rosen
@ 2013-04-10 18:13 ` Junio C Hamano
2013-04-10 19:28 ` Junio C Hamano
2013-04-11 7:45 ` Tay Ray Chuan
1 sibling, 1 reply; 4+ messages in thread
From: Junio C Hamano @ 2013-04-10 18:13 UTC (permalink / raw)
To: Jeremy Rosen; +Cc: Git List
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git rebase : knowing where I am...
2013-04-10 18:13 ` Junio C Hamano
@ 2013-04-10 19:28 ` Junio C Hamano
0 siblings, 0 replies; 4+ messages in thread
From: Junio C Hamano @ 2013-04-10 19:28 UTC (permalink / raw)
To: Jeremy Rosen; +Cc: Git List
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: git rebase : knowing where I am...
2013-04-10 8:40 git rebase : knowing where I am Jeremy Rosen
2013-04-10 18:13 ` Junio C Hamano
@ 2013-04-11 7:45 ` Tay Ray Chuan
1 sibling, 0 replies; 4+ messages in thread
From: Tay Ray Chuan @ 2013-04-11 7:45 UTC (permalink / raw)
To: Jeremy Rosen; +Cc: Git List
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-04-11 7:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-10 8:40 git rebase : knowing where I am Jeremy Rosen
2013-04-10 18:13 ` Junio C Hamano
2013-04-10 19:28 ` Junio C Hamano
2013-04-11 7:45 ` Tay Ray Chuan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).