gogs/bindata at a3bd40fa5161bdd3ab39e307e1e23ccae005cb0e - gogs

mharinder a3bd40fa51 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).	7 years ago
..
bindata.go	pull: add an option to use rebase for merging pull requests	7 years ago

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

7 years ago

bindata.go

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

7 years ago