# git rebase : knowing where I am... 4 messages from 2013-04-10 to 2013-04-11. Participants: Jeremy Rosen, Junio C Hamano, Tay Ray Chuan. Thread: https://gitlist.dev/t/33456 ## Jeremy Rosen, 2013-04-10 08:40 Subject: git rebase : knowing where I am... Message-ID: <1124759476.1420642.1365583233806.JavaMail.root@openwide.fr> URL: https://gitlist.dev/e/1124759476.1420642.1365583233806.JavaMail.root%40openwide.fr ``` 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, 2013-04-10 18:13 Subject: Re: git rebase : knowing where I am... Message-ID: <7vvc7umey0.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vvc7umey0.fsf%40alter.siamese.dyndns.org In-Reply-To: <1124759476.1420642.1365583233806.JavaMail.root@openwide.fr> ``` Jeremy Rosen 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, 2013-04-10 19:28 Subject: Re: git rebase : knowing where I am... Message-ID: <7v4nfembi5.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4nfembi5.fsf%40alter.siamese.dyndns.org In-Reply-To: <7vvc7umey0.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > Jeremy Rosen 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, 2013-04-11 07:45 Subject: Re: git rebase : knowing where I am... Message-ID: URL: https://gitlist.dev/e/CALUzUxrkt-7svY83FFnn23Xk0bTp%3DvW3OiFB8xq_Aw_0AcV_Mw%40mail.gmail.com In-Reply-To: <1124759476.1420642.1365583233806.JavaMail.root@openwide.fr> ``` On Wed, Apr 10, 2013 at 4:40 PM, Jeremy Rosen 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 ```