[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: Gitlab, Git History and Merge Options
From:       Tomaz Canabrava <tcanabrava () kde ! org>
Date:       2020-05-19 8:38:24
Message-ID: CACk01_yEWK0--Vyi3QfT9q==Xi9szHQK=KqSViBPiTRTBTm8bA () mail ! gmail ! com
[Download RAW message or body]

Ah, you are a saint <3


On Tue, May 19, 2020 at 10:20 AM Bhushan Shah <bhush94@gmail.com> 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 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 already having the `github style`
> ladder
> > of merge commits. That really makes a hard time for git bisect.
>
> We have globally enabled this option for all repositories already right
> after migration, so if you're still seeing new instances of the such
> merge commits, please let us know.
>
> Thanks
>
> --
> Bhushan Shah
> http://blog.bshah.in
> IRC Nick : bshah on Freenode
> GPG key fingerprint : 0AAC 775B B643 7A8D 9AF7 A3AC FE07 8411 7FBC E11D
>

[Attachment #3 (text/html)]

<div dir="ltr"><div>Ah, you are a saint &lt;3</div><div><br></div></div><br><div \
class="gmail_quote"><div dir="ltr" class="gmail_attr">On Tue, May 19, 2020 at 10:20 \
AM Bhushan Shah &lt;<a href="mailto:bhush94@gmail.com">bhush94@gmail.com</a>&gt; \
wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px \
0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Hi Tomaz,<br> <br>
On Tue, May 19, 2020 at 10:10:41AM +0200, Tomaz Canabrava wrote:<br>
&gt; By default Gitlab will create merge commits, and this can create a really<br>
&gt; nasty history if   a branch is based on a branch and not in master. To<br>
&gt; overcome this, please - if you own a repository - go to the repository<br>
&gt; settings, Merge Requests, Fast Forward Merge.<br>
&gt; <br>
&gt; I see that a few repositories are already having the `github style` ladder<br>
&gt; of merge commits. That really makes a hard time for git bisect.<br>
<br>
We have globally enabled this option for all repositories already right<br>
after migration, so if you&#39;re still seeing new instances of the such<br>
merge commits, please let us know.<br>
<br>
Thanks<br>
<br>
-- <br>
Bhushan Shah<br>
<a href="http://blog.bshah.in" rel="noreferrer" \
target="_blank">http://blog.bshah.in</a><br> IRC Nick : bshah on Freenode<br>
GPG key fingerprint : 0AAC 775B B643 7A8D 9AF7 A3AC FE07 8411 7FBC E11D<br>
</blockquote></div>



[prev in list] [next in list] [prev in thread] [next in thread]