Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Ben Cooksley
On Tue, May 19, 2020 at 9:05 PM Ralf Habacker wrote: > > Am 19.05.20 um 10:10 schrieb Tomaz Canabrava: > > By default Gitlab will create merge commits, and this can create a > > really nasty history if a branch is based on a branch and not in > > master. To overcome this, please - if you own a re

Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Ralf Habacker
Am 19.05.20 um 10:10 schrieb Tomaz Canabrava: By default Gitlab will create merge commits, and this can create a really nasty history if  a branch is based on a branch and not in master. To overcome this, please - if you own a repository - go to the repository settings, Merge Requests, Fast For

Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Tomaz Canabrava
Ah, you are a saint <3 On Tue, May 19, 2020 at 10:20 AM Bhushan Shah wrote: > Hi Tomaz, > > On Tue, May 19, 2020 at 10:10:41AM +0200, Tomaz Canabrava wrote: > > By default Gitlab will create merge commits, and this can create a really > > nasty history if a branch is based on a branch and not

Re: Gitlab, Git History and Merge Options

2020-05-19 Thread Bhushan Shah
Hi Tomaz, On Tue, May 19, 2020 at 10:10:41AM +0200, Tomaz Canabrava wrote: > By default Gitlab will create merge commits, and this can create a really > nasty history if a branch is based on a branch and not in master. To > overcome this, please - if you own a repository - go to the repository >

Gitlab, Git History and Merge Options

2020-05-19 Thread Tomaz Canabrava
By default Gitlab will create merge commits, and this can create a really nasty history if a branch is based on a branch and not in master. To overcome this, please - if you own a repository - go to the repository settings, Merge Requests, Fast Forward Merge. I see that a few repositories are alr