about summary refs log tree commit diff
path: root/third_party/git/builtin/merge.c (follow)
AgeCommit message (Expand)AuthorFilesLines
2021-09-21 r/2903 chore(3p/git): Unvendor git and track patches insteadVincent Ambo1-1715/+0
2020-11-21 r/1890 merge(3p/git): Merge git subtree at v2.29.2Vincent Ambo1-31/+66
2020-05-26 r/852 revert(3p/git): Revert merge of git upstream at v2.26.2Vincent Ambo1-25/+15
2020-05-22 r/808 merge(3p/git): Merge git upstream at v2.26.2Vincent Ambo1-15/+25
2020-01-11 r/373 merge(third_party/git): Merge squashed git subtree at v2.23.0Vincent Ambo1-0/+1680