Re: [msysGit] upload-pack timing issue on windows?

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]