github-starred/gitea
2
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-03-15 20:52:52 -05:00
Code Issues 2.6k Packages Projects Releases 100 Wiki Activity

Add "Rebase AND merge commit" (--no-ff) to Pull Request #1727

New Issue
Closed
opened 2025-11-02 04:11:29 -06:00 by GiteaMirror · 1 comment
GiteaMirror commented 2025-11-02 04:11:29 -06:00
Owner
Copy Link

Originally created by @InExtremaRes on GitHub (Apr 23, 2018).

Since #3188 Gitea has possibility of "Rebase and merge" who is great, but if you are looking for a workflow similar to git-flow then sometimes you need to rebase a branch and then merge it with a commit merge using git merge --no-ff. This keeps history almost linear while keeping track of the commits of a particular PR.

So, is there any chance to implement a sort of "Rebase and merge commit" that merge with --no-ff option after a successful rebase?

Of course this can be done manually, but it would be nice to make that on PR itself.

Originally created by @InExtremaRes on GitHub (Apr 23, 2018). Since #3188 Gitea has possibility of "Rebase and merge" who is great, but if you are looking for a workflow similar to git-flow then sometimes you need to rebase a branch and then merge it with a commit merge using `git merge --no-ff`. This keeps history _almost_ linear while keeping track of the commits of a particular PR. So, is there any chance to implement a sort of "Rebase and merge commit" that merge with `--no-ff` option after a successful rebase? Of course this can be done manually, but it would be nice to make that on PR itself.
GiteaMirror added the type/feature label 2025-11-02 04:11:29 -06:00
GiteaMirror commented 2025-11-02 04:11:30 -06:00
Author
Owner
Copy Link

@davidak commented on GitHub (Jan 26, 2019):

This is included in 1.7 release. So can get closed.

https://blog.gitea.io/2019/01/gitea-1.7.0-is-released/

@davidak commented on GitHub (Jan 26, 2019): This is included in 1.7 release. So can get closed. https://blog.gitea.io/2019/01/gitea-1.7.0-is-released/
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 type/feature
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#1727
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?