在解决冲突时，我如何判断 git 变基的距离？

Question

I am rebasing in git and am encountering many conflicts. I address each one and do git rebase --continue , only to be met with the next conflict. How can I see how close I am to successfully completing the rebase?

Answer 1

I'm not sure if you can get a measure of how far you have to go, but it lists how many commits into the rebase you are. In the error output is a line that looks like

Patch failed at 0003 <commit message>

0003 means you're three commits into the rebase.

Answer 2

It looks like you can see a list of patches here:

.git/rebase-apply/[0-9]*

Answer 3

If your question is about seeing how many conflicts are already resolved, I have I usually do a quick

$ git diff

while doing a rebase. Conflicting parts will not be staged yet (assuming you are using git mergetool ).

Alternatively you could also directly grep for the conflict markers.

If you want to know how many commits were already applied, just use

$ git log REBASE_BASE..

where REBASE_BASE is the commit you are rebasing onto.

Answer 4

The text file.git/sequencer/todo will show you the next commits to be rebased or cherry-picked.

Also, in Windows, the Git Bash shell has the rebase progress status in the prompt in the following format:
(branch-name|REBASE 1/10)

From Powershell I can get to Git Bash with this command:
sh --login