Re: git rebase : knowing where I am...
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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git rebase : knowing where I am...
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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git rebase : knowing where I am...
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. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
