Hi, > I've tried creating a 'next' branch where I merge each change from local > and/or external, and this seems to work, but the history gets very > cluttered with merge commits. You could cherry-pick commits from local and/or external instead of merging. See git-cherry-pick(1). Regards, Stephan -- Stephan Beyer <s-beyer@xxxxxxx>, PGP 0x6EDDD207FCC5040F -- 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
