You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

zeripath e5ded0ee19 Ensure that rebase conflicts are handled in updates (#16952) (#16960) ... Backport #16952 PR #16125 did not update the error handlers to handle conflict errors relating to rebases. This PR adds them. Fix #16922 Signed-off-by: Andrew Thornton <art27@cantab.net>		4 years ago
..
api/v1	Ensure that rebase conflicts are handled in updates (#16952) (#16960)	4 years ago
common	Support custom mime type mapping for text files (#16304)	4 years ago
install	just add some unit tests (#16291)	4 years ago
private	Restore functionality for pushing non-standard refs (Partial #16705) (#16706)	4 years ago
utils	just add some unit tests (#16291)	4 years ago
web	Ensure that rebase conflicts are handled in updates (#16952) (#16960)	4 years ago
init.go	Add LRU mem cache implementation (#16226)	4 years ago