From: Junio Hamano <junio@twinsun.com>
To: Linus Torvalds <torvalds@osdl.org>
Cc: junkio@cox.net, git@vger.kernel.org
Subject: Re: rsync update appears broken now
Date: Thu, 20 Oct 2005 16:37:50 -0700 [thread overview]
Message-ID: <7vek6f220h.fsf@arte.twinsun.com> (raw)
In-Reply-To: <Pine.LNX.4.64.0510201432260.10477@g5.osdl.org> (Linus Torvalds's message of "Thu, 20 Oct 2005 14:32:44 -0700 (PDT)")
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).
> 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?
next prev parent reply other threads:[~2005-10-20 23:38 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-20 12:47 rsync update appears broken now Randal L. Schwartz
2005-10-20 13:08 ` Alex Riesen
2005-10-20 14:12 ` Randal L. Schwartz
2005-10-20 14:24 ` Alex Riesen
2005-10-20 17:48 ` Linus Torvalds
2005-10-20 20:48 ` Junio C Hamano
2005-10-20 21:32 ` Linus Torvalds
2005-10-20 23:37 ` Junio Hamano [this message]
2005-10-20 23:41 ` Johannes Schindelin
2005-10-20 23:49 ` Linus Torvalds
2005-10-21 0:01 ` Johannes Schindelin
2005-10-21 0:19 ` Linus Torvalds
2005-10-21 0:34 ` Petr Baudis
2005-10-20 23:47 ` Linus Torvalds
2005-10-21 0:26 ` Junio C Hamano
2005-10-21 0:52 ` Linus Torvalds
2005-10-21 13:49 ` Randal L. Schwartz
2005-10-21 15:26 ` Linus Torvalds
2005-10-20 14:15 ` Morten Welinder
2005-10-20 18:03 ` dave morgan
2005-10-20 15:03 ` Stephen C. Tweedie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vek6f220h.fsf@arte.twinsun.com \
--to=junio@twinsun.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).