gogs/conf at a3bd40fa5161bdd3ab39e307e1e23ccae005cb0e - gogs

History

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
..
gitignore	conf/gitignore: use correct OS name (#4240 )	8 years ago
label	Load a set of predefined labels (#3459 )	8 years ago
license	Update ISC license	9 years ago
locale	pull: add an option to use rebase for merging pull requests	7 years ago
readme	complate list of gitignores and licenses	9 years ago
README.md	Some minor changes	9 years ago
app.ini	Add Dingtalk webhook support (#4773 )	7 years ago

Execute following command in ROOT directory when anything is changed:

$ make bindata