Re: rsync update appears broken now
- From
Junio Hamano <junio@twinsun.com>
- Date
- Oct 20, 2005, 23:37 UTC
- Message-ID
- <7vek6f220h.fsf@arte.twinsun.com>
- In-Reply-To
- <Pine.LNX.4.64.0510201432260.10477@g5.osdl.org>
Linus Torvalds <torvalds@osdl.org> writes:
> What you _must_ do to fix things up is that _you_ merge your current head > with your old head, and then you push out the result.
Yes. That is what I will do when able (not right now).
I posted a workaround because I am at work and I do not have access to kernel.org machine from here, and I did not pull yesterday at work so I do not have an access to that lost side branch until later today (I think I still have it in my private repo, either on my home machine or my ~/git on hera).
Show 6 quoted lines
> At that point: > >> -----(A) head merlyn and everybody >> / pulled from kernel.org previously >> --- common ------------------------------------(B) head rebased and pushed >> out by mistake
Mind telling me the (A) commit ID if you know it?