diff options
| author | zeripath <art27@cantab.net> | 2020-04-03 17:00:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-03 19:00:41 +0300 |
| commit | 97eb37e823f103c74c79da2b5e070d753a920403 (patch) | |
| tree | 8b40650763baf89597928e999931c2866a06d9e9 /docs | |
| parent | 57cca44c5e75025bc3d51bea028ca7012557f4f5 (diff) | |
| download | gitea-97eb37e823f103c74c79da2b5e070d753a920403.tar.gz gitea-97eb37e823f103c74c79da2b5e070d753a920403.zip | |
Fix rebase conflict detection in git 2.26 (#10929)
* 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>
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions