From 5cd1fdeb9ee1af1179a859dc5ed65561bfe5a6d6 Mon Sep 17 00:00:00 2001 From: mharinder Date: Sun, 1 Oct 2017 05:37:24 -0700 Subject: pull: add an option to use rebase for merging pull requests For DVCS, either merge or rebase works for getting new code in a pull request in the main branch. The rebase workflow produces a linear history which is cleaner, and more bisect-able. This commit adds a repo-level option to enable the rebase workflow. Once enabled, "Merge Pull Request" will be replaced by "Rebase and Merge Pull Request" which does exactly what the user wants. It's unlikely a project wants a mixed-use of both rebase and merge workflows, therefore the feature is not implemented as a drop-down button like what GitHub does (https://github.com/blog/2243-rebase-and-merge-pull-requests). --- routes/repo/setting.go | 1 + 1 file changed, 1 insertion(+) (limited to 'routes/repo/setting.go') diff --git a/routes/repo/setting.go b/routes/repo/setting.go index 71369320..8e244b6e 100644 --- a/routes/repo/setting.go +++ b/routes/repo/setting.go @@ -147,6 +147,7 @@ func SettingsPost(c *context.Context, f form.RepoSetting) { repo.ExternalTrackerFormat = f.TrackerURLFormat repo.ExternalTrackerStyle = f.TrackerIssueStyle repo.EnablePulls = f.EnablePulls + repo.PullUseRebase = f.PullUseRebase if err := models.UpdateRepository(repo, false); err != nil { c.ServerError("UpdateRepository", err) -- cgit v1.2.3