about summary refs log tree commit diff
path: root/third_party/git/Documentation/config/branch.txt
AgeCommit message (Collapse)AuthorFilesLines
2020-11-21 r/1890 merge(3p/git): Merge git subtree at v2.29.2Vincent Ambo1-3/+4
This also bumps the stable nixpkgs to 20.09 as of 2020-11-21, because there is some breakage in the git build related to the netrc credentials helper which someone has taken care of in nixpkgs. The stable channel is not used for anything other than git, so this should be fine. Change-Id: I3575a19dab09e1e9556cf8231d717de9890484fb
2020-05-26 r/852 revert(3p/git): Revert merge of git upstream at v2.26.2Vincent Ambo1-4/+3
This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3.
2020-05-22 r/808 merge(3p/git): Merge git upstream at v2.26.2Vincent Ambo1-3/+4
2020-01-11 r/373 merge(third_party/git): Merge squashed git subtree at v2.23.0Vincent Ambo1-0/+102
Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'