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

2013-04-24 Thread Felipe Contreras
On Tue, Apr 23, 2013 at 10:08 AM, Junio C Hamano wrote: > Zoltan Klinger writes: > >> 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 th

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

2013-04-24 Thread Eric Sunshine
On Tue, Apr 23, 2013 at 8:35 AM, Zoltan Klinger wrote: > 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 app

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

2013-04-23 Thread Junio C Hamano
Zoltan Klinger writes: > 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 co

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

2013-04-23 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