github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-06 19:09:28 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

[PR #4052] [MERGED] Add rebase with merge commit merge style (#3844) #17215

New Issue
Closed
opened 2025-11-02 12:29:44 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2025-11-02 12:29:44 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/go-gitea/gitea/pull/4052
Author: @apricote
Created: 5/26/2018
Status: ✅ Merged
Merged: 12/27/2018
Merged by: @lafriks

Base: master ← Head: rebase-merge-commit

📝 Commits (10+)

  • 9eb247b add rebase with merge commit merge style (#3844)
  • ad025d9 Merge branch 'master' into rebase-merge-commit
  • 5bfe7e4 Merge remote-tracking branch 'origin/master' into rebase-merge-commit
  • 801decd fix merge
  • 9a4aefa rename MergeStyleRebaseMergeCommit to MergeStyleRebaseMerge
  • 90a7c96 enable RebaseMerge by default for new repositories
  • 79ec917 Merge branch 'master' into rebase-merge-commit
  • 4d8d3e1 enable MergeRebase if all other merge styles are enabled
  • a910dbb remove test todo note
  • b387fc1 Merge branch 'master' into rebase-merge-commit

📊 Changes

14 files changed (+162 additions, -5 deletions)

View changed files

📝 integrations/pull_merge_test.go (+13 -0)
📝 models/fixtures/repo_unit.yml (+2 -2)
📝 models/migrations/migrations.go (+2 -0)
➕ models/migrations/v76.go (+63 -0)
📝 models/pull.go (+37 -0)
📝 models/repo.go (+1 -1)
📝 models/repo_unit.go (+2 -0)
📝 modules/auth/repo_form.go (+2 -1)
📝 options/locale/locale_en-US.ini (+2 -0)
📝 routers/repo/issue.go (+2 -0)
📝 routers/repo/pull.go (+3 -0)
📝 routers/repo/setting.go (+1 -0)
📝 templates/repo/issue/view_content/pull.tmpl (+26 -1)
📝 templates/repo/settings/options.tmpl (+6 -0)

📄 Description

This PR adds the Rebase and Merge (--no-ff) merge style as requested in #3844.

Known Bugs:

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/go-gitea/gitea/pull/4052 **Author:** [@apricote](https://github.com/apricote) **Created:** 5/26/2018 **Status:** ✅ Merged **Merged:** 12/27/2018 **Merged by:** [@lafriks](https://github.com/lafriks) **Base:** `master` ← **Head:** `rebase-merge-commit` --- ### 📝 Commits (10+) - [`9eb247b`](https://github.com/go-gitea/gitea/commit/9eb247b4a98a3db14e91e3bd83cab7d77f2516d4) add rebase with merge commit merge style (#3844) - [`ad025d9`](https://github.com/go-gitea/gitea/commit/ad025d9f205460a59507c75b1aed716b3281376b) Merge branch 'master' into rebase-merge-commit - [`5bfe7e4`](https://github.com/go-gitea/gitea/commit/5bfe7e4467a6ad2b07ef6c88043f1bc7e5b8b9a9) Merge remote-tracking branch 'origin/master' into rebase-merge-commit - [`801decd`](https://github.com/go-gitea/gitea/commit/801decda01c4d7b44767e6e2f66f65c42ec2dc8f) fix merge - [`9a4aefa`](https://github.com/go-gitea/gitea/commit/9a4aefa07670e158abcea2b237a0c934554cea2d) rename MergeStyleRebaseMergeCommit to MergeStyleRebaseMerge - [`90a7c96`](https://github.com/go-gitea/gitea/commit/90a7c966563a9464dd6b89fbf0394342d1d455e5) enable RebaseMerge by default for new repositories - [`79ec917`](https://github.com/go-gitea/gitea/commit/79ec917b433f870abb7a79dccde129e3b94151ee) Merge branch 'master' into rebase-merge-commit - [`4d8d3e1`](https://github.com/go-gitea/gitea/commit/4d8d3e1055985c4b30a53b88f173b3794d05d3de) enable MergeRebase if all other merge styles are enabled - [`a910dbb`](https://github.com/go-gitea/gitea/commit/a910dbb6550b99374665e590b1c58c0e75226217) remove test todo note - [`b387fc1`](https://github.com/go-gitea/gitea/commit/b387fc147af2078935f51ce35af23e4e3f6e3c7a) Merge branch 'master' into rebase-merge-commit ### 📊 Changes **14 files changed** (+162 additions, -5 deletions) <details> <summary>View changed files</summary> 📝 `integrations/pull_merge_test.go` (+13 -0) 📝 `models/fixtures/repo_unit.yml` (+2 -2) 📝 `models/migrations/migrations.go` (+2 -0) ➕ `models/migrations/v76.go` (+63 -0) 📝 `models/pull.go` (+37 -0) 📝 `models/repo.go` (+1 -1) 📝 `models/repo_unit.go` (+2 -0) 📝 `modules/auth/repo_form.go` (+2 -1) 📝 `options/locale/locale_en-US.ini` (+2 -0) 📝 `routers/repo/issue.go` (+2 -0) 📝 `routers/repo/pull.go` (+3 -0) 📝 `routers/repo/setting.go` (+1 -0) 📝 `templates/repo/issue/view_content/pull.tmpl` (+26 -1) 📝 `templates/repo/settings/options.tmpl` (+6 -0) </details> ### 📄 Description This PR adds the `Rebase and Merge (--no-ff)` merge style as requested in #3844. --- Known Bugs: - [x] ~~As with the `Rebase and Merge` style, if the rebase can not be done cleanly, the merge will result in a `500` error page~~ Tracked in #4078 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2025-11-02 12:29:45 -06:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
$20
$250
$50
$500
backport/done
💎 Bounty
docs-update-needed
good first issue
hacktoberfest
issue/bounty
issue/confirmed
issue/critical
issue/duplicate
issue/needs-feedback
issue/not-a-bug
issue/regression
issue/stale
issue/workaround
lgtm/need 2
modifies/api
modifies/translation
outdated/backport/v1.18
outdated/theme/markdown
outdated/theme/timetracker
performance/bigrepo
performance/cpu
performance/memory
performance/speed
pr/breaking
proposal/accepted
proposal/rejected
pr/wip
pull-request
Mirrored from GitHub Pull Request
 reviewed/wontfix
💰 Rewarded
skip-changelog
status/blocked
topic/accessibility
topic/api
topic/authentication
topic/build
topic/code-linting
topic/commit-signing
topic/content-rendering
topic/deployment
topic/distribution
topic/federation
topic/gitea-actions
topic/issues
topic/lfs
topic/mobile
topic/moderation
topic/packages
topic/pr
topic/projects
topic/repo
topic/repo-migration
topic/security
topic/theme
topic/ui
topic/ui-interaction
topic/ux
topic/webhooks
topic/wiki
type/bug
type/deprecation
type/docs
type/enhancement
type/feature
type/miscellaneous
type/proposal
type/question
type/refactoring
type/summary
type/testing
type/upstream
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/gitea#17215
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?