Re: Is there a way to find out which commit "git rebase --skip" skipped?

2012-08-17 Thread Junio C Hamano
Luke Diamand writes: > All I need is to be able to get the commit *immediately* after the > failed 'git rebase'. It looks like .git/ORIG_HEAD has exactly what I > need. Depends on what you meant by "commit that was skipped", but the above makes me nervous. ORIG_HEAD is set to the tip of the bra

Re: Is there a way to find out which commit "git rebase --skip" skipped?

2012-08-17 Thread Luke Diamand
On 16/08/12 16:43, Junio C Hamano wrote: Luke Diamand writes: If I do "git rebase --skip", is there a way to find out the commit SHA that was skipped (other than just parsing the output of the command) ? There currently isn't, and I do not think it is doable in general when the command ever

Re: Is there a way to find out which commit "git rebase --skip" skipped?

2012-08-16 Thread Junio C Hamano
Luke Diamand writes: > If I do "git rebase --skip", is there a way to find out the commit SHA > that was skipped (other than just parsing the output of the command) ? There currently isn't, and I do not think it is doable in general when the command ever gives control back to the user to futz wi

Is there a way to find out which commit "git rebase --skip" skipped?

2012-08-16 Thread Luke Diamand
If I do "git rebase --skip", is there a way to find out the commit SHA that was skipped (other than just parsing the output of the command) ? I'd like to modify git-p4 so that it can automatically skip past conflicting changes, but I'd like it to keep a log of which commits were skipped. Thanks,