aboutsummaryrefslogtreecommitdiffstats
path: root/services/pull/patch.go
Commit message (Expand)AuthorAgeFilesLines
* Make git.OpenRepository accept Context (#19260)65432022-03-301-1/+1
* When conflicts have been previously detected ensure that they can be resolved...zeripath2022-03-291-17/+18
* Change git.cmd to RunWithContext (#18693)Martin Scholz2022-02-111-5/+7
* Add apply-patch, basic revert and cherry-pick functionality (#17902)zeripath2022-02-091-13/+24
* Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)65432022-02-061-10/+10
* Detect conflicts with 3way merge (#18536)zeripath2022-02-021-0/+13
* Propagate context and ensure git commands run in request context (#17868)zeripath2022-01-191-13/+17
* Reset the conflicted files list in testpatch (#18139)zeripath2021-12-311-0/+1
* Improve TestPatch to use git read-tree -m and implement git-merge-one-file fu...zeripath2021-12-191-5/+192
* Move unit into models/unit/ (#17576)Lunny Xiao2021-11-091-1/+2
* Don't return binary file changes in raw PR diffs by default (#17158)Norwin2021-09-271-3/+3
* refactor: move from io/ioutil to io and os package (#17109)Eng Zer Jun2021-09-221-2/+1
* Support unprotected file patterns (#16395)Jimmy Praet2021-09-111-53/+42
* Make manual merge autodetection optional and add manual merge as merge method...a10121127962021-03-031-2/+3
* [Enhancement] Allow admin to merge pr with protected file changes (#12078)赵智超2020-10-131-11/+145
* Re-attempt to delete temporary upload if the file is locked by another proces...zeripath2020-08-111-1/+2
* Generate Diff and Patch direct from Pull head (#10936)zeripath2020-04-031-17/+4
* Remove Unused Functions (#10516)65432020-03-021-10/+0
* Add require signed commit for protected branch (#9708)zeripath2020-01-151-1/+2
* Add owner_name column for table repository for maintaince reason (#9717)Lunny Xiao2020-01-121-4/+4
* Remove stray printf (#9631)zeripath2020-01-071-1/+0
* Remove SavePatch and generate patches on the fly (#9302)zeripath2019-12-131-0/+216