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/contrib/svn-fe/svn-fe.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'third_party/git/contrib/svn-fe/svn-fe.txt') diff --git a/third_party/git/contrib/svn-fe/svn-fe.txt b/third_party/git/contrib/svn-fe/svn-fe.txt index 19333fc8df..a3425f4770 100644 --- a/third_party/git/contrib/svn-fe/svn-fe.txt +++ b/third_party/git/contrib/svn-fe/svn-fe.txt @@ -56,7 +56,7 @@ line. This line has the form `git-svn-id: URL@REVNO UUID`. The resulting repository will generally require further processing to put each project in its own repository and to separate the history -of each branch. The 'git filter-repo --subdirectory-filter' command +of each branch. The 'git filter-branch --subdirectory-filter' command may be useful for this purpose. BUGS @@ -67,5 +67,5 @@ The exit status does not reflect whether an error was detected. SEE ALSO -------- -git-svn(1), svn2git(1), svk(1), git-filter-repo(1), git-fast-import(1), +git-svn(1), svn2git(1), svk(1), git-filter-branch(1), git-fast-import(1), https://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt -- cgit 1.4.1