{"thread":{"id":"33456","subject":"git rebase : knowing where I am...","startedAt":"2013-04-10T08:40:33Z","lastAt":"2013-04-11T07:45:38Z","messageCount":4,"participants":["Jeremy Rosen","Junio C Hamano","Tay Ray Chuan"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"213757","messageId":"1124759476.1420642.1365583233806.JavaMail.root@openwide.fr","threadId":"33456","inReplyTo":null,"subject":"git rebase : knowing where I am...","fromName":"Jeremy Rosen","fromEmail":"jeremy.rosen@openwide.fr","sentAt":"2013-04-10T08:40:33Z","receivedAt":"2013-04-10T08:40:33Z","isPatch":false,"sender":{"key":"jeremy.rosen@openwide.fr","avatar":null},"body":"Hello\n\nis 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 ?\n\nI would have expected a git rebase --status or something similar...\n\n    Regards\n\n    Jérémy Rosen\n\nfight key loggers : write some perl using vim\n"},{"id":"213794","messageId":"7vvc7umey0.fsf@alter.siamese.dyndns.org","threadId":"33456","inReplyTo":"1124759476.1420642.1365583233806.JavaMail.root@openwide.fr","subject":"Re: git rebase : knowing where I am...","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-10T18:13:43Z","receivedAt":"2013-04-10T18:13:43Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeremy Rosen <jeremy.rosen@openwide.fr> writes:\n\n> is there some way to know how far you are within a rebase when the\n> rebase is interupted by a conflict other than the message given by\n> git rebase when it was interrupted ?\n\nI do not think there is a \"git $anything\" command to do that, but in\nthe meantime you could \"cat .git/rebase-*/git-rebase-todo\" or\nsomething.\n\nRecent trend is to teach \"git status\" more about these internal states,\nso with time the command may learn to include this in its output.\n"},{"id":"213813","messageId":"7v4nfembi5.fsf@alter.siamese.dyndns.org","threadId":"33456","inReplyTo":"7vvc7umey0.fsf@alter.siamese.dyndns.org","subject":"Re: git rebase : knowing where I am...","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-04-10T19:28:02Z","receivedAt":"2013-04-10T19:28:02Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano <gitster@pobox.com> writes:\n\n> Jeremy Rosen <jeremy.rosen@openwide.fr> writes:\n>\n>> is there some way to know how far you are within a rebase when the\n>> rebase is interupted by a conflict other than the message given by\n>> git rebase when it was interrupted ?\n>\n> I do not think there is a \"git $anything\" command to do that, but in\n> the meantime you could \"cat .git/rebase-*/git-rebase-todo\" or\n> something.\n>\n> Recent trend is to teach \"git status\" more about these internal states,\n> so with time the command may learn to include this in its output.\n\nI actually often do this myself, not \"cat anything\" as I mentioned\nabove:\n\n\tgit show-branch $branch_I_am_rebasing HEAD\n"},{"id":"213910","messageId":"CALUzUxrkt-7svY83FFnn23Xk0bTp=vW3OiFB8xq_Aw_0AcV_Mw@mail.gmail.com","threadId":"33456","inReplyTo":"1124759476.1420642.1365583233806.JavaMail.root@openwide.fr","subject":"Re: git rebase : knowing where I am...","fromName":"Tay Ray Chuan","fromEmail":"rctay89@gmail.com","sentAt":"2013-04-11T07:45:38Z","receivedAt":"2013-04-11T07:45:38Z","isPatch":false,"sender":{"key":"rctay89@gmail.com","avatar":"https://avatars.githubusercontent.com/u/61553?v=4"},"body":"On Wed, Apr 10, 2013 at 4:40 PM, Jeremy Rosen <jeremy.rosen@openwide.fr> wrote:\n> 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 ?\n\nHow about\n\n  $ cat .git/rebase-merge/done\n\nsample output:\n\n  p 3b465bd foo2 1\n  e 03f8bea foo2 2\n  e 0871817 foo2 1\n\nlast line is the current commit being edited/under conflict/etc.\n\n--\nCheers,\nRay Chuan\n"}]}