2009/6/9 joe higton <draxil@xxxxxxxxx>: > Hi, > I want to merge changes from a branch but only to one file, I > don't want to pick up the changes from other files. I've scoured > google and the docs a bit but I can't find anything useful. Is this > possible? Generally - no. But you can have a merge with only the content of your choice: git merge -s ours --no-commit other then copy the changes you need manually, and commit. See the manpage of git merge about "ours" merge strategy. -- 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