Making that configurable is a nice idea if it fits nicely in the codebase. Best regards, Sytse Sijbrandij CEO GitLab B.V.
On Wed, Mar 11, 2015 at 3:58 AM, Sverre Moe <[email protected]> wrote: > GitLab should definitely consider supporting more merge strategies in future > versions. Atlassian Strash seems to have a way to define which merge flags > should be used when performing a merge/pull request. > > git merge > --ff > --ff-only > --log > --squash > > Would it be correct to say that GitLab default merge request performs "git > merge --no-ff", and with Rebase before merge it does a simple "git merge". > > tirsdag 10. mars 2015 23.17.12 UTC+1 skrev sytse følgende: >> >> Sverre, that is correct. If you want to merge without a commit without >> the 'rebase before merge' function you'll have to do the merge on the >> command line. >> >> Best regards, >> Sytse Sijbrandij >> CEO GitLab B.V. >> >> >> On Mon, Mar 9, 2015 at 5:57 AM, Sverre Moe <[email protected]> wrote: >> > I tried the rebase before merge in GitLab. It does seem to work. I >> > doesn't >> > add an extra merge commit. >> > It looks like then if you do not choose "Rebase before merge" then >> > GitLab >> > explicitly uses --no-ff. >> > >> > mandag 9. mars 2015 10.42.12 UTC+1 skrev Sverre Moe følgende: >> >> >> >> I took a rebase manually on the command line before I performed the >> >> merge >> >> request in GitLab. >> >> >> >> If GitLab uses --no-ff explicitly it does not matter if one rebase, it >> >> will always create a merge commit. Though I am not sure if GitLab does >> >> use >> >> the flag --no-ff, but in its command line suggestion it is used. >> >> >> >> mandag 9. mars 2015 05.20.34 UTC+1 skrev sytse følgende: >> >>> >> >>> You're probably looking for the 'rebase before merge functionality' in >> >>> GitLab EE. >> >>> >> >>> Best regards, >> >>> Sytse Sijbrandij >> >>> CEO GitLab B.V. >> >>> >> >>> >> >>> On Tue, Mar 3, 2015 at 7:04 AM, Sverre Moe <[email protected]> wrote: >> >>> > Seems GitLab is lacking this feature. >> >>> > Found an issue on this: >> >>> > https://gitlab.com/gitlab-org/gitlab-ce/issues/766 >> >>> > >> >>> > This is definitely something that GitLab should support. Our >> >>> > workflow >> >>> > demands that merges to master and develop should be fast-forward >> >>> > only. >> >>> > >> >>> > Seems GitLab does this on purpose: >> >>> > https://about.gitlab.com/2014/09/29/gitlab-flow/ >> >>> > "Merge requests always create a merge commit even when the commit >> >>> > could >> >>> > be >> >>> > added without one. This merge strategy is called 'no fast-forward' >> >>> > in >> >>> > git." >> >>> > >> >>> > tirsdag 3. mars 2015 15.17.07 UTC+1 skrev Sverre Moe følgende: >> >>> >> >> >>> >> While performing merge requests in GitLab is there any options to >> >>> >> set >> >>> >> that >> >>> >> it should only merge if fast-forward only. >> >>> >> >> >>> >> While merging feature branches I want to avoid an extra merge >> >>> >> commit >> >>> >> like >> >>> >> this one >> >>> >> Merge branch 'user/work' into 'develop' >> >>> >> >> >>> >> I need the merge to use -ff, --ff-only and --log. >> >>> >> git merge --ff --ff-only --log origin/user/work >> >>> > >> >>> > -- >> >>> > You received this message because you are subscribed to the Google >> >>> > Groups >> >>> > "GitLab" group. >> >>> > To unsubscribe from this group and stop receiving emails from it, >> >>> > send >> >>> > an >> >>> > email to [email protected]. >> >>> > To view this discussion on the web visit >> >>> > >> >>> > >> >>> > https://groups.google.com/d/msgid/gitlabhq/73d2ceeb-f2ec-4c00-91f9-e32aeb8e9734%40googlegroups.com. >> >>> > >> >>> > For more options, visit https://groups.google.com/d/optout. >> > >> > -- >> > You received this message because you are subscribed to the Google >> > Groups >> > "GitLab" group. >> > To unsubscribe from this group and stop receiving emails from it, send >> > an >> > email to [email protected]. >> > To view this discussion on the web visit >> > >> > https://groups.google.com/d/msgid/gitlabhq/660eae0b-7389-4371-90d8-fdea67d95343%40googlegroups.com. >> > >> > For more options, visit https://groups.google.com/d/optout. > > -- > You received this message because you are subscribed to the Google Groups > "GitLab" group. > To unsubscribe from this group and stop receiving emails from it, send an > email to [email protected]. > To view this discussion on the web visit > https://groups.google.com/d/msgid/gitlabhq/88dd1f26-d1d7-4a54-8d5d-a927b5c07e37%40googlegroups.com. > > For more options, visit https://groups.google.com/d/optout. -- You received this message because you are subscribed to the Google Groups "GitLab" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/gitlabhq/CAJTzhG-XHC_1nV8LTWbXDQX1jEkzW%3Dfm4M5xbxgTWfbc8e7JBA%40mail.gmail.com. For more options, visit https://groups.google.com/d/optout.
