aboutsummaryrefslogtreecommitdiffstats
path: root/services/pull/patch_unmerged.go
Commit message (Expand)AuthorAgeFilesLines
* Implement FSFE REUSE for golang files (#21840)flynnnnnnnnnn2022-11-271-2/+1
* Replace all instances of fmt.Errorf(%v) with fmt.Errorf(%w) (#21551)delvh2022-10-241-3/+3
* Ensure that all unmerged files are merged when conflict checking (#20528)zeripath2022-07-291-1/+24
* Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)wxiaoguang2022-04-011-5/+4
* Change git.cmd to RunWithContext (#18693)Martin Scholz2022-02-111-6/+8
* Delete old git.NewCommand() and use it as git.NewCommandContext() (#18552)65432022-02-061-1/+1
* Improve TestPatch to use git read-tree -m and implement git-merge-one-file fu...zeripath2021-12-191-0/+180