{"thread":{"id":"43219","subject":"Merging in commits from a non-common ancestors","startedAt":"2006-11-21T15:28:03Z","lastAt":"2006-11-21T15:41:36Z","messageCount":2,"participants":["Alex Bennee","Jakub Narebski"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"294057","messageId":"1164122884.28560.210.camel@okra.transitives.com","threadId":"43219","inReplyTo":null,"subject":"Merging in commits from a non-common ancestors","fromName":"Alex Bennee","fromEmail":"kernel-hacker@bennee.com","sentAt":"2006-11-21T15:28:03Z","receivedAt":"2006-11-21T15:28:03Z","isPatch":false,"sender":{"key":"kernel-hacker@bennee.com","avatar":null},"body":"Hi,\n\nI've been experimenting with using git alongside our CVS to manage my\nown development. In an ideal world I would have a full git tree with all\nthe baselines tagged in it so merging is painless. However for the time\nbeing I have written a script to import a cvs tag into a git tree (that\nignores the CVS gubbins). However one of the things I want to achieve is\nthe ability to easily move hacks/patches from one tree to another.\n\nThe problem is that these tree's don't have common ancestor's in the git\ntree as I haven't imported all our baselines. However the individual\ncommits should apply, I'm just not sure how to tell git to apply the\ncommits as patches rather than try and work out the full differences\nbetween the two trees. Of course I'd like git to keep the commit\nmessages.\n\nAm I missing something blindingly obvious?\n\n-- \nAlex, homepage: http://www.bennee.com/~alex/\nIn seeking the unattainable, simplicity only gets in the way. --\nEpigrams in Programming, ACM SIGPLAN Sept. 1982\n"},{"id":"294891","messageId":"ejv6kk$6uu$1@sea.gmane.org","threadId":"43219","inReplyTo":"1164122884.28560.210.camel@okra.transitives.com","subject":"Re: Merging in commits from a non-common ancestors","fromName":"Jakub Narebski","fromEmail":"jnareb@gmail.com","sentAt":"2006-11-21T15:41:36Z","receivedAt":"2006-11-21T15:41:36Z","isPatch":false,"sender":{"key":"jnareb@gmail.com","avatar":"https://avatars.githubusercontent.com/u/2706?v=4"},"body":"Alex Bennee wrote:\n\n> I've been experimenting with using git alongside our CVS to manage my\n> own development. In an ideal world I would have a full git tree with all\n> the baselines tagged in it so merging is painless. However for the time\n> being I have written a script to import a cvs tag into a git tree (that\n> ignores the CVS gubbins). However one of the things I want to achieve is\n> the ability to easily move hacks/patches from one tree to another.\n> \n> The problem is that these tree's don't have common ancestor's in the git\n> tree as I haven't imported all our baselines. However the individual\n> commits should apply, I'm just not sure how to tell git to apply the\n> commits as patches rather than try and work out the full differences\n> between the two trees. Of course I'd like git to keep the commit\n> messages.\n\ngit cherry-pick. It uses patching instead of merging. \n\nOr git-format-patch plus git-am.\n\n-- \nJakub Narebski\nWarsaw, Poland\nShadeHawk on #git\n\n"}]}