summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-09-30 04:19:29 (GMT)
commit91243b019ddba5248f0fde319bc75e4e2b5602b0 (patch)
treed551e69310943710f453b89a39f6408c9d9d9242 /contrib
parent9bc67b6658a031b92cba4a7489b78a4da902ecbf (diff)
parent483e861111444b1e7c5c6a8442f2a306508adfb0 (diff)
downloadgit-91243b019ddba5248f0fde319bc75e4e2b5602b0.zip
git-91243b019ddba5248f0fde319bc75e4e2b5602b0.tar.gz
git-91243b019ddba5248f0fde319bc75e4e2b5602b0.tar.bz2
Merge branch 'en/filter-branch-deprecation'
Start discouraging the use of "git filter-branch". * en/filter-branch-deprecation: t9902: use a non-deprecated command for testing Recommend git-filter-repo instead of git-filter-branch t6006: simplify, fix, and optimize empty message test
Diffstat (limited to 'contrib')
-rw-r--r--contrib/svn-fe/svn-fe.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/svn-fe/svn-fe.txt b/contrib/svn-fe/svn-fe.txt
index a3425f4..19333fc 100644
--- a/contrib/svn-fe/svn-fe.txt
+++ b/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-branch --subdirectory-filter' command
+of each branch. The 'git filter-repo --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-branch(1), git-fast-import(1),
+git-svn(1), svn2git(1), svk(1), git-filter-repo(1), git-fast-import(1),
https://svn.apache.org/repos/asf/subversion/trunk/notes/dump-load-format.txt