5 Commits

Author	SHA1	Message	Date
Dan Čermák	b8c9a0c323	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.	2025-06-19 12:29:10 -07:00
wxiaoguang	39de2955fd	Improve sync fork behavior (#33319) ... Fix #33271 Suppose there is a `branch-a` in fork repo: 1. if `branch-a` exists in base repo: try to sync `base:branch-a` to `fork:branch-a` 2. if `branch-a` doesn't exist in base repo: try to sync `base:main` to `fork:branch-a`	2025-01-20 15:17:47 +08:00
Chai-Shi	55e0756c68	Fix push message behavior (#33215) ... Fixes #32769 by the logic from pr #33192 --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>	2025-01-17 19:37:17 +00:00
Chai-Shi	e5f3c16587	Fix sync fork for consistency (#33147) ... Fixes #33145 An integration test could be added. --------- Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>	2025-01-10 05:29:55 +00:00
wxiaoguang	513da407f4	Support "merge upstream branch" (Sync fork) (#32741) ... Add basic "sync fork" support (GitHub-like) <details>  </details>	2024-12-06 21:10:35 +00:00