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] > <javascript:>> 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] <javascript:>. > > 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/35d9bdf2-939e-4b7c-ae49-f3c21db404a7%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
