Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add merge style fast-forward-only #28954

Merged
merged 10 commits into from
Feb 12, 2024
Merged

Add merge style fast-forward-only #28954

merged 10 commits into from
Feb 12, 2024

Commits on Jan 28, 2024

  1. Add merge style fast-forward-only 

    With this option, it is possible to require a linear commit history with
the following benefits over the next best option Rebase+fast-forward:
the original commits continue existing, with the original signatures
continuing to stay valid instead of being rewritten, there is no merge
commit, and reverting commits becomes easier.

Closes go-gitea#24906
    @chrisnc
    chrisnc committed Jan 28, 2024
    Configuration menu
    Copy the full SHA
    f45c6c8 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. add ErrMergeDivergingFastForwardOnly

    @chrisnc
    chrisnc committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    35e23f4 View commit details
    Browse the repository at this point in the history

  2. add integration tests for fast-forward-only merges

    @chrisnc
    chrisnc committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    ab3088f View commit details
    Browse the repository at this point in the history

  3. fix pull.tmpl ctx.Locale.Tr

    @chrisnc
    chrisnc committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    87e018a View commit details
    Browse the repository at this point in the history

  4. fix options.tmpl ctx.Locale.Tr

    @chrisnc
    chrisnc committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    7c170d6 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2024

  1. fix integration tests

    @chrisnc
    chrisnc committed Feb 4, 2024
    Configuration menu
    Copy the full SHA
    c13f1a6 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2024

  1. Merge branch 'main' into fast-forward-only

    @GiteaBot
    GiteaBot authored Feb 11, 2024
    Configuration menu
    Copy the full SHA
    3127ee0 View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2024

  1. Merge branch 'main' into fast-forward-only

    @GiteaBot
    GiteaBot authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    adaf093 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into fast-forward-only

    @GiteaBot
    GiteaBot authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    b0b777f View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into fast-forward-only

    @GiteaBot
    GiteaBot authored Feb 12, 2024
    Configuration menu
    Copy the full SHA
    70b405f View commit details
    Browse the repository at this point in the history