summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-21 15:18:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-21 15:18:41 -0800
commit19b4520ba9c367bf562d1fe38deaa2b96be81309 (patch)
tree25426ea4f79ac52b4bd92c488f174ae38f0d03be
parentMerge branch 'jc/fetch-tags-doc' (diff)
parentREADME: it does not matter who the current maintainer is (diff)
downloadtgif-19b4520ba9c367bf562d1fe38deaa2b96be81309.tar.xz
Merge branch 'sl/readme-gplv2'
Clarify that the project as a whole is GPLv2 only, with some parts borrowed under different licenses that are compatible with GPLv2. * sl/readme-gplv2: README: it does not matter who the current maintainer is README: Git is released under the GPLv2, not just "the GPL"
-rw-r--r--README7
1 files changed, 4 insertions, 3 deletions
diff --git a/README b/README
index d2690ec8dc..49713ea08e 100644
--- a/README
+++ b/README
@@ -19,9 +19,10 @@ Git is a fast, scalable, distributed revision control system with an
unusually rich command set that provides both high-level operations
and full access to internals.
-Git is an Open Source project covered by the GNU General Public License.
-It was originally written by Linus Torvalds with help of a group of
-hackers around the net. It is currently maintained by Junio C Hamano.
+Git is an Open Source project covered by the GNU General Public
+License version 2 (some parts of it are under different licenses,
+compatible with the GPLv2). It was originally written by Linus
+Torvalds with help of a group of hackers around the net.
Please read the file INSTALL for installation instructions.