From: Petr Baudis <pasky@suse.cz>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio Hamano <junio@twinsun.com>,
junkio@cox.net, git@vger.kernel.org
Subject: Re: rsync update appears broken now
Date: Fri, 21 Oct 2005 02:34:49 +0200 [thread overview]
Message-ID: <20051021003449.GZ30889@pasky.or.cz> (raw)
In-Reply-To: <Pine.LNX.4.64.0510201717100.10477@g5.osdl.org>
Dear diary, on Fri, Oct 21, 2005 at 02:19:42AM CEST, I got a letter
where Linus Torvalds <torvalds@osdl.org> told me that...
> On Fri, 21 Oct 2005, Johannes Schindelin wrote:
> > It does not have to be a fast-forward. After all, what is another merge?
> > Since that merge does not have Junio as committer, close inspection of
> > the commit will reveal that.
>
> It _does_ have to be a fast-forward, if you expect the tree to have the
> same content as Junio's.
>
> Even if it merges everything automatically, if the history is different,
> it could in theory at least merge _differently_ than what Junio had. Plus
> you'll have a really ugly version history for no good reason.
And if Junio will want to merge with many of those people, you will
better have to get a dualhead for your gitk.
--
Petr "Pasky" Baudis
Stuff: http://pasky.or.cz/
VI has two modes: the one in which it beeps and the one in which
it doesn't.
next prev parent reply other threads:[~2005-10-21 0:34 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
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 [this message]
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=20051021003449.GZ30889@pasky.or.cz \
--to=pasky@suse.cz \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=junio@twinsun.com \
--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).