From 93ba78d6f4632ef1c5228965e3edc8c0faf88c1e Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Tue, 26 May 2020 00:06:52 +0100 Subject: revert(3p/git): Revert merge of git upstream at v2.26.2 This causes cgit to serve error pages, which is undesirable. This reverts commit 5229c9b232de5bfa959ad6ebbb4c8192ac513352, reversing changes made to f2b211131f2347342dde63975b09cf603149f1a3. --- third_party/git/Documentation/RelNotes/2.10.0.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'third_party/git/Documentation/RelNotes/2.10.0.txt') diff --git a/third_party/git/Documentation/RelNotes/2.10.0.txt b/third_party/git/Documentation/RelNotes/2.10.0.txt index 3792b7d03d5f..f4da28ab6690 100644 --- a/third_party/git/Documentation/RelNotes/2.10.0.txt +++ b/third_party/git/Documentation/RelNotes/2.10.0.txt @@ -478,7 +478,7 @@ notes for details). * One part of "git am" had an oddball helper function that called stuff from outside "his" as opposed to calling what we have "ours", which was not gender-neutral and also inconsistent with the rest of - the system where outside stuff is usually called "theirs" in + the system where outside stuff is usuall called "theirs" in contrast to "ours". * "git blame file" allowed the lineage of lines in the uncommitted, -- cgit 1.4.1