From: Johannes Sixt <j6t@kdbg.org>
To: kusmabite@gmail.com
Cc: msysgit@googlegroups.com, Git Mailing List <git@vger.kernel.org>
Subject: Re: [msysGit] upload-pack timing issue on windows?
Date: Wed, 25 Aug 2010 22:53:03 +0200 [thread overview]
Message-ID: <201008252253.04516.j6t@kdbg.org> (raw)
In-Reply-To: <AANLkTinboi+L3fvC___pULO0u_ZBNNOM6er+chxt7s07@mail.gmail.com>
On Mittwoch, 25. August 2010, Erik Faye-Lund wrote:
> But I'm curious, what's the best way of import a couple of foreign
> source files, while maintaining a couple of patches on top of them?
> I'm thinking that perhaps a import-commit followed by the patches
> would make it easier to merge in changes than to just import the
> patched version, but I'm not entirely sure how to do such a merge
> without merging a full subtree...
This is about only two files. When a new version is available from upstream,
just branch from the import-commit, apply the two new files, and merge the
result.
-- Hannes
next prev parent reply other threads:[~2010-08-25 20:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-02-05 23:51 upload-pack timing issue on windows? Erik Faye-Lund
2010-02-06 10:06 ` Johannes Sixt
2010-02-06 12:01 ` [msysGit] " Erik Faye-Lund
2010-02-06 22:18 ` Johannes Sixt
2010-02-08 11:18 ` Erik Faye-Lund
2010-02-10 20:41 ` Jay Soffian
2010-08-22 23:27 ` Erik Faye-Lund
2010-08-24 19:24 ` Johannes Sixt
2010-08-25 17:40 ` Erik Faye-Lund
2010-08-25 20:53 ` Johannes Sixt [this message]
2010-08-25 20:57 ` Erik Faye-Lund
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=201008252253.04516.j6t@kdbg.org \
--to=j6t@kdbg.org \
--cc=git@vger.kernel.org \
--cc=kusmabite@gmail.com \
--cc=msysgit@googlegroups.com \
/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).