[Feature request] Allow autosquash in merging dialog of pull request/merge request #7990

New Issue

GiteaMirror · 2025-11-02T07:44:18-06:00

GiteaMirror commented

2025-11-02 07:44:18 -06:00

Originally created by @travnja3 on GitHub (Oct 18, 2021).

Feature Description

Squashing commits in a pull request/merge request joins every commit into a single one. There may be a reason to leave commits separate though. If so any fixup commits need to be squashed with their linked commits manually.

Git provides autosquash option with the interactive rebase. A truly interactive rebase is not requested here, however, an interactive rebase that accepts what is proposed by autosquash automatically would have its use for fixup commits.

A possible implementation would be to call the interactive rebase with its editor changed to something like "true" (we have aliased this as fixuprebase):
git config --global alias.fixuprebase '!GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash'

Screenshots

No response

Originally created by @travnja3 on GitHub (Oct 18, 2021). ### Feature Description Squashing commits in a pull request/merge request joins every commit into a single one. There may be a reason to leave commits separate though. If so any fixup commits need to be squashed with their linked commits manually. Git provides autosquash option with the interactive rebase. A truly interactive rebase is not requested here, however, an interactive rebase that accepts what is proposed by autosquash automatically would have its use for fixup commits. A possible implementation would be to call the interactive rebase with its editor changed to something like "true" (we have aliased this as fixuprebase): git config --global alias.fixuprebase '!GIT_SEQUENCE_EDITOR=true git rebase -i --autosquash' ### Screenshots _No response_

GiteaMirror added the type/feature type/proposal labels 2025-11-02 07:44:18 -06:00

Sign in to join this conversation.

Branches Tags

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github-starred/gitea#7990