[PATCH v2] bash-prompt.sh: Show where rebase is at when interrupted by a merge conflict

2013-04-25 Thread Zoltan Klinger
When a rebase is interrupted by a merge conflict it could be useful to know how far a rebase has progressed and how many commits in total this rebase will apply. Teach the __git_ps1() command to display the number of commits so far applied and the total number of commits to be applied. Below is a

Re: [PATCH v2] bash-prompt.sh: Show where rebase is at when interrupted by a merge conflict

2013-04-25 Thread Junio C Hamano
Zoltan Klinger zoltan.klin...@gmail.com writes: When a rebase is interrupted by a merge conflict it could be useful to The command also stops when told to stop with amend, etc. no? I would phrase this way When a rebase stops (e.g. interrupted ...), it could be useful This information can