diff options
author | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-15 15:53:10 +0000 |
---|---|---|
committer | Ben Brown <ben.brown@codethink.co.uk> | 2020-07-15 15:53:10 +0000 |
commit | a90b02e5e0fbfac1215c4839875552d43cf245fc (patch) | |
tree | 97cf7d6d4abf3c459466fb3c7c6c038e56d29945 | |
parent | 4600f8f0beba655f72b4bb0098f94d47a0152a29 (diff) | |
parent | 79830886716a9c2728a24c6692d5c8447aea5118 (diff) | |
download | lorry-a90b02e5e0fbfac1215c4839875552d43cf245fc.tar.gz |
Merge branch 'bwh/doc-names' into 'master'
Use document names expected by GitLab
See merge request CodethinkLabs/lorry/lorry!9
-rw-r--r-- | LICENSE | 25 | ||||
-rw-r--r-- | README.md (renamed from README) | 26 |
2 files changed, 26 insertions, 25 deletions
@@ -0,0 +1,25 @@ +Copyright (C) 2013-2020 Codethink Limited + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; version 2 of the License. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +We carry 2 slightly modified git-fast-import frontends: + +lorry.tar-importer which is based on +https://github.com/git/git/blob/master/contrib/fast-import/import-tars.perl + +and lorry.zip-importer, which is based on +https://github.com/git/git/blob/master/contrib/fast-import/import-zips.py + +all parts of git are under a GPLv2 compatible license, +see the git source code for more details. @@ -293,28 +293,4 @@ Tips Legal stuff ----------- -Copyright (C) 2013-2020 Codethink Limited - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; version 2 of the License. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -We carry 2 slightly modified git-fast-import frontends: - -lorry.tar-importer which is based on -https://github.com/git/git/blob/master/contrib/fast-import/import-tars.perl - -and lorry.zip-importer, which is based on -https://github.com/git/git/blob/master/contrib/fast-import/import-zips.py - -all parts of git are under a GPLv2 compatible license, -see the git source code for more details. +See the LICENSE file. |