From: Olivier Galibert <galibert@pobox.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Glanzmann <thomas@glanzmann.de>,
Bryan Childs <godeater@gmail.com>,
git@vger.kernel.org
Subject: Re: Git Vs. Svn for a project which *must* distribute binaries too.
Date: Mon, 4 Jun 2007 23:21:21 +0200 [thread overview]
Message-ID: <20070604212121.GA31852@dspnet.fr.eu.org> (raw)
In-Reply-To: <alpine.LFD.0.98.0706041336440.23741@woody.linux-foundation.org>
On Mon, Jun 04, 2007 at 01:45:26PM -0700, Linus Torvalds wrote:
> I'd like to point out some more upsides and downsides of "git rebase".
>
> Downsides:
>
> - you're rewriting history, so you MUST NOT have made your pre-rebase
> changes available publicly anywhere else (or you are in a world of pain
> with duplicate history and tons of confusion)
Wouldn't it be possible to register the rebase somewhere (weak parent?
some kind of note not influencing the sha1 ?) that pull/merge could
follow? Rebases and cherry-picking are a special kind of merge, so
maybe it can be handled like one where it counts...
OG.
next prev parent reply other threads:[~2007-06-04 21:27 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-06-04 11:48 Git Vs. Svn for a project which *must* distribute binaries too Bryan Childs
2007-06-04 11:56 ` Julian Phillips
2007-06-04 13:18 ` Theodore Tso
2007-06-04 14:58 ` Johannes Schindelin
2007-06-04 15:20 ` Linus Torvalds
2007-06-04 15:38 ` Bryan Childs
2007-06-04 16:23 ` Linus Torvalds
2007-06-04 17:57 ` Thomas Glanzmann
2007-06-04 20:45 ` Linus Torvalds
2007-06-04 21:21 ` Olivier Galibert [this message]
2007-06-04 21:33 ` Linus Torvalds
2007-06-04 22:30 ` Joel Becker
2007-06-05 11:19 ` Theodore Tso
2007-06-05 2:56 ` Johannes Schindelin
2007-06-04 22:29 ` Martin Langhoff
2007-06-04 23:48 ` Daniel Barkalow
2007-06-05 0:21 ` Linus Torvalds
2007-06-05 1:42 ` david
2007-06-05 3:58 ` Linus Torvalds
2007-06-04 23:46 ` Jakub Narebski
2007-06-06 22:34 ` Jakub Narebski
-- strict thread matches above, loose matches on Subject: below --
2007-06-07 4:36 linux
2007-06-07 7:57 ` Bryan Childs
2007-06-07 16:51 ` linux
2007-06-08 20:41 ` Jan Hudec
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=20070604212121.GA31852@dspnet.fr.eu.org \
--to=galibert@pobox.com \
--cc=git@vger.kernel.org \
--cc=godeater@gmail.com \
--cc=thomas@glanzmann.de \
--cc=torvalds@linux-foundation.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).