diff options
| author | Dan Čermák <dcermak@suse.com> | 2025-06-19 21:29:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-19 12:29:10 -0700 |
| commit | b8c9a0c323dd8945128acec6b0b9af0452f59ebe (patch) | |
| tree | 8e09b50a302f69429d6d6d38ab32bfba1f7d0fb9 /web_src/js/components/DiffFileTree.vue | |
| parent | 7346ae7cd4a097ace0dee7757af65e43a48e8b77 (diff) | |
| download | gitea-b8c9a0c323dd8945128acec6b0b9af0452f59ebe.tar.gz gitea-b8c9a0c323dd8945128acec6b0b9af0452f59ebe.zip | |
Add ff_only parameter to POST /repos/{owner}/{repo}/merge-upstream (#34770)
The merge-upstream route was so far performing any kind of merge, even
those that would create merge commits and thus make your branch diverge
from upstream, requiring manual intervention via the git cli to undo the
damage.
With the new optional parameter ff_only, we can instruct gitea to error
out, if a non-fast-forward merge would be performed.
Diffstat (limited to 'web_src/js/components/DiffFileTree.vue')
0 files changed, 0 insertions, 0 deletions