Markus Heidelberg, 14.11.2008: > Yes, a rebase does make more sense. But as I would separate macvim from > runtime, I wouldn't just rebase macvim/master on vim_extended/vim. I just > tried "git format-patch macvim/vim..macvim/master". Then you have the bare > macvim patches, as the runtime files are committed to macvim/vim, which you > can apply with "git am". But keep care, I found a patch with runtime file > updates, commit ef6776890f3f3d324d7d32cb17fc1cefb0c61bd2 was committed to > macvim/master instead of macvim/vim. Maybe there are some more? Anyway, I > tried it for interest and the first conflict where git am failed was at patch > 290 out of 672.
Oh, of course there is the --onto option for "git rebase", this should basically do the same as what I suggested by manually working with git diff and am. git checkout -b macvim macvim/master git rebase --onto vim_extended/vim macvim/vim Maybe even with --interactive to remove the slipped through runtime patches. Markus --~--~---------~--~----~------------~-------~--~----~ You received this message from the "vim_dev" maillist. For more information, visit http://www.vim.org/maillist.php -~----------~----~----~----~------~----~------~--~---
