mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-09-06 22:33:14 +00:00
* Fix rebase conflict detection in git 2.26 Git changed the technique used in rebase from simple apply-patches to use merge. This breaks our conflict detection code. Signed-off-by: Andrew Thornton <art27@cantab.net> * As per @techknowlogick reduce copying Signed-off-by: Andrew Thornton <art27@cantab.net> |
||
---|---|---|
.. | ||
comments | ||
externalaccount | ||
gitdiff | ||
issue | ||
mailer | ||
mirror | ||
pull | ||
release | ||
repository | ||
wiki |