Code

Add merge style fast-forward-only#28954

Code

Merged

delvh merged 10 commits intogo-gitea:maingo-gitea/gitea:mainfrom chrisnc:fast-forward-onlychrisnc/gitea:fast-forward-onlyCopy head branch name to clipboardFeb 12, 2024

+204-11

Commits

Commits on Jan 28, 2024

• Add merge style fast-forward-only

  Show description for f45c6c8
  chrisnc

  committed
  f45c6c8

  Copy full SHA for f45c6c8

Commits on Jan 30, 2024

• add ErrMergeDivergingFastForwardOnly

  chrisnc

  committed
  35e23f4

  Copy full SHA for 35e23f4

• add integration tests for fast-forward-only merges

  chrisnc

  committed
  ab3088f

  Copy full SHA for ab3088f

• fix pull.tmpl ctx.Locale.Tr

  chrisnc

  committed
  87e018a

  Copy full SHA for 87e018a

• fix options.tmpl ctx.Locale.Tr

  chrisnc

  committed
  7c170d6

  Copy full SHA for 7c170d6

Commits on Feb 4, 2024

• fix integration tests

  chrisnc

  committed
  c13f1a6

  Copy full SHA for c13f1a6

Commits on Feb 11, 2024

• Merge branch 'main' into fast-forward-only

  GiteaBot

  authored
  3127ee0

  Copy full SHA for 3127ee0

Commits on Feb 12, 2024

• Merge branch 'main' into fast-forward-only

  GiteaBot

  authored
  adaf093

  Copy full SHA for adaf093

• Merge branch 'main' into fast-forward-only

  GiteaBot

  authored
  b0b777f

  Copy full SHA for b0b777f

• Merge branch 'main' into fast-forward-only

  GiteaBot

  authored
  70b405f

  Copy full SHA for 70b405f