Hi, On 2014-11-07 12:27, Rainer Gerhards wrote: > So maybe it is better to merge pull requests into new feature branches, and > then work "as usual": merge feature branch into adiscon-master, squash > feature branch, then merge it as single commit into master. > > To sum up: I would like to have two branches, the private one with all > detail information, the public one minus those commits that are considered > distracting. What is the best way to achieve this goal?
Sounds like http://nvie.com/posts/a-successful-git-branching-model/ Regarding my rebase suggestion you maybe want to read http://randyfay.com/content/rebase-workflow-git for a better understanding. -Thomas _______________________________________________ rsyslog mailing list http://lists.adiscon.net/mailman/listinfo/rsyslog http://www.rsyslog.com/professional-services/ What's up with rsyslog? Follow https://twitter.com/rgerhards NOTE WELL: This is a PUBLIC mailing list, posts are ARCHIVED by a myriad of sites beyond our control. PLEASE UNSUBSCRIBE and DO NOT POST if you DON'T LIKE THAT.
