From: Ed Tomlinson <tomlins@cam.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Pavel Machek <pavel@ucw.cz>, Petr Baudis <pasky@ucw.cz>,
kernel list <linux-kernel@vger.kernel.org>
Subject: Re: Linux 2.6.12-rc3
Date: Sat, 23 Apr 2005 08:21:23 -0400 [thread overview]
Message-ID: <200504230821.24884.tomlins@cam.org> (raw)
In-Reply-To: <Pine.LNX.4.58.0504221718410.2344@ppc970.osdl.org>
On Friday 22 April 2005 20:21, Linus Torvalds wrote:
>
> On Sat, 23 Apr 2005, Pavel Machek wrote:
> >
> > Unfortunately first merge will make it practically unusable :-(.
>
> No, quite the reverse. If I merge from you, and you use my commit ID as
> the "base" point, it will work again.
>
> But yes, if you actually send the result as _patches_ to me, then the
> commit objects I create will be totally separate from the commit objects
> you had in your tree, and "git-export" will continue to export your old
> stale entries since they won't show up as already being in my tree.
>
> The point being, that there is a big difference between a proper merge
> (with history etc merged) and just sending me the patches in your tree.
Using git patch, the output has the commit id. Could this be used during
a merge of patches to record info that the source git could use to recognize
the changes as ones it originated (after a pull from the remote git which has
the merged patches)?
Ed Tomlinson
next prev parent reply other threads:[~2005-04-23 12:20 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-04-21 0:59 Linux 2.6.12-rc3 Linus Torvalds
2005-04-21 1:09 ` Alejandro Bonilla
2005-04-21 1:26 ` James Purser
2005-04-21 1:38 ` Patrick McFarland
2005-04-21 2:01 ` Alejandro Bonilla
2005-04-21 4:03 ` Barry K. Nathan
2005-04-21 8:17 ` Martin Schlemmer
2005-04-21 8:49 ` Jan Dittmer
2005-04-21 8:59 ` Jan Dittmer
2005-04-21 9:10 ` Geert Uytterhoeven
2005-04-21 16:11 ` Al Viro
2005-04-21 17:39 ` Al Viro
2005-04-22 22:18 ` Roman Zippel
2005-05-30 23:48 ` more thread_info patches Roman Zippel
2005-05-30 23:50 ` Roman Zippel
2005-05-30 23:51 ` Roman Zippel
2005-05-31 12:16 ` Vincent Hanquez
2005-05-30 23:52 ` Roman Zippel
2005-05-31 1:25 ` randy_dunlap
2005-05-31 9:35 ` Roman Zippel
2005-05-31 15:37 ` randy_dunlap
2005-04-21 17:45 ` Linux 2.6.12-rc3 Al Viro
2005-04-21 17:57 ` Al Viro
2005-04-21 18:08 ` Al Viro
2005-04-25 19:14 ` Geert Uytterhoeven
2005-04-26 3:24 ` Al Viro
2005-04-26 8:21 ` Geert Uytterhoeven
2005-04-21 18:04 ` Al Viro
2005-04-25 19:12 ` Geert Uytterhoeven
2005-04-21 11:20 ` Pavel Machek
2005-04-21 12:03 ` Pavel Machek
2005-04-21 16:22 ` Petr Baudis
2005-04-21 19:00 ` Pavel Machek
2005-04-21 19:09 ` Petr Baudis
2005-04-21 21:38 ` Pavel Machek
2005-04-21 21:41 ` Petr Baudis
2005-04-21 22:30 ` Pavel Machek
2005-04-23 21:31 ` Pavel Machek
2005-04-21 23:22 ` Pavel Machek
2005-04-21 23:33 ` Linus Torvalds
2005-04-22 0:21 ` Petr Baudis
2005-04-22 23:18 ` Pavel Machek
2005-04-23 0:21 ` Linus Torvalds
2005-04-23 11:19 ` Pavel Machek
2005-04-23 14:15 ` Linus Torvalds
2005-04-23 16:27 ` Pierre Ossman
2005-04-23 22:02 ` Greg KH
2005-04-23 22:29 ` Pavel Machek
2005-04-23 23:38 ` Greg KH
2005-04-24 10:26 ` Andrew Morton
2005-04-24 17:44 ` Linus Torvalds
2005-04-24 19:06 ` Sam Ravnborg
2005-04-24 19:55 ` Greg KH
2005-04-24 20:17 ` Pavel Machek
2005-04-24 20:29 ` Pavel Machek
2005-04-24 22:48 ` David S. Miller
2005-04-24 23:17 ` Marcel Holtmann
2005-04-25 7:40 ` Anton Altaparmakov
2005-04-26 5:25 ` Len Brown
2005-04-26 5:50 ` Andrew Morton
2005-04-23 23:00 ` Pavel Machek
2005-04-23 23:06 ` Petr Baudis
2005-04-24 7:21 ` Pavel Machek
2005-04-24 7:35 ` Dmitry Torokhov
2005-04-24 5:45 ` Greg KH
2005-04-23 12:21 ` Ed Tomlinson [this message]
2005-04-23 23:23 ` Petr Baudis
2005-04-24 7:25 ` Pavel Machek
2005-04-21 12:18 ` Martin Schlemmer
2005-04-22 7:55 ` H. Peter Anvin
2005-04-21 12:19 ` Ralf Hildebrandt
2005-04-21 15:45 ` Randy.Dunlap
2005-04-21 13:33 ` Andreas Steinmetz
2005-04-22 0:31 ` Greg KH
2005-04-21 14:24 ` Linux 2.6.12-rc3: Oops on IDE flash disk eject Andreas Steinmetz
2005-04-21 15:27 ` Andreas Steinmetz
2005-04-21 17:00 ` Linux 2.6.12-rc3: various swsusp problems Andreas Steinmetz
2005-04-21 18:57 ` Pavel Machek
2005-04-21 20:02 ` Andreas Steinmetz
2005-04-25 9:50 ` Pavel Machek
2005-04-21 20:55 ` Andreas Steinmetz
2005-04-22 15:13 ` Stefan Seyfried
2005-04-23 2:57 ` Dmitry Torokhov
2005-04-23 8:18 ` Stefan Seyfried
2005-04-23 9:14 ` Pavel Machek
2005-04-21 19:10 ` Linux 2.6.12-rc3 Benoit Boissinot
-- strict thread matches above, loose matches on Subject: below --
2005-04-22 7:56 Borislav Petkov
2005-04-24 5:42 ` Greg KH
2005-04-24 6:27 ` Borislav Petkov
2005-04-24 7:30 ` Christoph Hellwig
[not found] <3VIcq-8ls-9@gated-at.bofh.it>
[not found] ` <3VIFr-px-7@gated-at.bofh.it>
[not found] ` <3VMJj-3Hv-61@gated-at.bofh.it>
[not found] ` <3VThx-16N-7@gated-at.bofh.it>
[not found] ` <3VUnf-1Ua-21@gated-at.bofh.it>
[not found] ` <3WfL8-33i-15@gated-at.bofh.it>
[not found] ` <3WgH8-3LO-3@gated-at.bofh.it>
[not found] ` <3WqZS-3qK-21@gated-at.bofh.it>
[not found] ` <3WtEl-5Ao-11@gated-at.bofh.it>
[not found] ` <3WBVe-3Qn-11@gated-at.bofh.it>
[not found] ` <3WIaj-8vN-3@gated-at.bofh.it>
2005-04-24 15:10 ` Bodo Eggert <harvested.in.lkml@posting.7eggert.dyndns.org>
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=200504230821.24884.tomlins@cam.org \
--to=tomlins@cam.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pasky@ucw.cz \
--cc=pavel@ucw.cz \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.