Re: pitfall with empty commits during git rebase

2014-07-11 Thread Jeff King
On Fri, Jul 11, 2014 at 12:15:47PM +0200, Olaf Hering wrote: > Could not apply 6c5842320acc797d395afb5cdf373c2bfaebfa34... revert > > > Its not clear what '--allow-empty' refers to, git rebase does not seem to > understand this option. I think this is the same problem discussed recently in:

Re: pitfall with empty commits during git rebase

2014-07-11 Thread Keller, Jacob E
On Fri, 2014-07-11 at 12:15 +0200, Olaf Hering wrote: > There is an incorrect message when doing "git rebase -i remote/branch". > I have it only in german, see below. what happend is: > > #01 make changes on another host > #02 copy patchfile to localhost > #03 apply patchfile > #04 git commit -avs

pitfall with empty commits during git rebase

2014-07-11 Thread Olaf Hering
There is an incorrect message when doing "git rebase -i remote/branch". I have it only in german, see below. what happend is: #01 make changes on another host #02 copy patchfile to localhost #03 apply patchfile #04 git commit -avs # create commit#1 #05 sleep 123456 #06 make different changes on a