Bill Lear wrote: > On Wednesday, January 24, 2007 at 00:29:00 (-0500) Daniel Barkalow writes: >> On Tue, 23 Jan 2007, Bill Lear wrote: >> >>> I have a long-running topic branch. I have fixed a few nits on >>> the master branch that I would like on the topic branch. How do I >>> pull in only a few files from the head of the master branch? >> You don't pull in a few files, you apply the changes made in a few >> commits: >> >> git diff HEX_OF_NIT_FIX^ HEX_OF_NIT_FIX | git apply >> ... > > Good technique. Thank you for sharing. > > I had been thinking about trying something along the lines of Junio's > "Separating topic branches" posted on the "GIT Howto Index" page. I > may have tried that had I been braver. > > I probably should have thought ahead and made this fix on a branch, > merged it into my master branch and then into my topic branch ... I > think. Perhaps you can just rebase that one fix 'back' onto the base. Then merge it into both. -apw - 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