Ian Hobson wrote: > So this solution is NOT working for maintaining parallel versions. [...] > re-applying the differences between each version (they are a set > of images and a config file). Okay, now that I’ve gotten that rebasing rant out of my system: I suspect the best thing would be to track the branding and configuration file separately from the main source tree. See http://thread.gmane.org/gmane.comp.version-control.git/146084/focus=146097 for hints. (sorry for the noise) Jonathan -- 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