On Wed, May 17, 2017 at 12:04 AM, Mattias Bengtsson <mattias.jc.bengts...@gmail.com> wrote: > At my work we keep a semi-linear git history: > - we only allow merges based on the tip of master > - we always merge with --no-ff (which is what GitLab's merge > button does) > > This gives us grouping of commits into features, while still > making sure our history is reasonably easy to follow.
Do you have a public repo online to see what this looks like? -- Alexandre Franke GNOME Hacker & Foundation Director _______________________________________________ desktop-devel-list mailing list desktop-devel-list@gnome.org https://mail.gnome.org/mailman/listinfo/desktop-devel-list
