mharinder 5cd1fdeb9e

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).

2017-11-15 23:28:23 -05:00

..

admin.go

Refactoring: rename modules -> pkg

2017-04-04 19:29:59 -04:00

auth.go

ldap: minor fix for PR #4398

2017-05-29 23:18:34 -04:00

form.go

Refactoring: rename modules -> pkg

2017-04-04 19:29:59 -04:00

org.go

Refactoring: rename modules -> pkg

2017-04-04 19:29:59 -04:00

repo.go

pull: add an option to use rebase for merging pull requests

2017-11-15 23:28:23 -05:00

user.go

Refactoring: rename modules -> pkg

2017-04-04 19:29:59 -04:00