From: Daniel Barkalow <barkalow@iabervon.org>
To: Matthias Urlichs <smurf@smurf.noris.de>
Cc: git@vger.kernel.org
Subject: Re: The coolest merge EVER!
Date: Fri, 24 Jun 2005 13:49:24 -0400 (EDT) [thread overview]
Message-ID: <Pine.LNX.4.21.0506241332150.30848-100000@iabervon.org> (raw)
In-Reply-To: <pan.2005.06.24.11.54.51.598627@smurf.noris.de>
On Fri, 24 Jun 2005, Matthias Urlichs wrote:
> Hi, Junio C Hamano wrote:
>
> > I suspect there
> > would be a massive additional support needed if you want to make it easy
> > for Paul to pull changes made to gitk in your tree.
>
> I don't think that's possible; after all, the trees are now merged, so any
> pull would fetch all of Linus' tree.
Linus could do:
git-read-tree gitk-head
git-update-cache gitk
git-commit-tree `write-tree` -p gitk-head > gitk-patched-head
git-read-tree HEAD
git merge gitk-patched-head
(or, better, use a separate index file for the gitk index)
(to commit changes to the gitk script made in a git working directory)
The change I proposed earlier would be so that the system would know what
was going on and users wouldn't have to. Then someone who didn't know that
gitk was (also) a separate project and just committed changes to it would
still generate gitk commits when appropriate.
-Daniel
*This .sig left intentionally blank*
next prev parent reply other threads:[~2005-06-24 17:47 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-06-22 21:46 The coolest merge EVER! Linus Torvalds
2005-06-23 0:12 ` Jon Seymour
2005-06-23 0:24 ` Jeff Garzik
2005-06-24 0:44 ` Junio C Hamano
2005-06-24 11:54 ` Matthias Urlichs
2005-06-24 17:49 ` Daniel Barkalow [this message]
2005-06-24 19:22 ` Linus Torvalds
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.21.0506241332150.30848-100000@iabervon.org \
--to=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=smurf@smurf.noris.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).