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 gitlabhq+unsubscr...@googlegroups.com. 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.
