zeripath 97eb37e823 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>		2020-04-03 19:00:41 +03:00
..
comments
externalaccount
gitdiff
issue	Add Organization Wide Labels (#10814)	2020-04-01 01:14:46 -03:00
mailer	[BugFix] Avoid mailing explicit unwatched (#10475)	2020-02-27 10:07:05 +00:00
mirror
pull	Fix rebase conflict detection in git 2.26 (#10929)	2020-04-03 19:00:41 +03:00
release	Move PushUpdateAddDeleteTags to repository module from models (#10106)	2020-02-03 09:47:04 +01:00
repository
wiki	Handle push rejection in branch and upload (#10854)	2020-03-28 01:13:18 -03:00