zeripath 8eeb2877d5 Adjust error reporting from merge failures and use LC_ALL=C for git (#8548) ... There are two major components to this PR: * This PR handles merge and rebase failures from merging a little more nicely with Flash errors rather a 500. * All git commands are run in the LC_ALL="C" environment to ensure that error messages are in English. This DefaultLocale is defined in a way that if necessary (due to platform weirdness) it can be overridden at build time using LDFLAGS="-X "code.gitea.io/gitea/modules/git.DefaultLocale=C"" with C changed for the locale as necessary.		2019-11-10 08:42:51 +00:00
..
commit_status.go	If no specific context is required for status check, require an overall success (#8318)	2019-09-30 10:33:40 +08:00
lfs.go	Add basic repository lfs management (#7199)	2019-10-28 18:31:55 +00:00
merge.go	Adjust error reporting from merge failures and use LC_ALL=C for git (#8548)	2019-11-10 08:42:51 +00:00
pull.go	Move pull webhook to notification (#8805)	2019-11-05 19:04:08 +08:00
review.go	Move pull webhook to notification (#8805)	2019-11-05 19:04:08 +08:00