git-svn-id: https://svn.lrde.epita.fr/perso/roland/trunk@822 be833968-19e8-472b-b5c8-4bceb4e44ec7 --- src/svn-to-git/convert-lrde-techreps-to-git | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/svn-to-git/convert-lrde-techreps-to-git b/src/svn-to-git/convert-lrde-techreps-to-git index f42913a..5bf9a6b 100755 --- a/src/svn-to-git/convert-lrde-techreps-to-git +++ b/src/svn-to-git/convert-lrde-techreps-to-git @@ -15,8 +15,8 @@ git branch -d git-svn # repo, so that commits and messages are correctly processed. git config i18n.commitencoding ISO-8859-1 # Get rid of the trunk/ prefix and remove branches/ and tags/ -# directories. As the head commit of rewitten `master' branch is -# imcompatible with the original checked out working copy, this +# directories. As the head commit of the rewritten `master' branch is +# incompatible with the original checked out working copy, this # command may complain about a failed merge and exit with an erroneous # status; just ignore it and reset to HEAD (i.e. `master'). git filter-branch \ -- 1.7.10.4