summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-12-22 20:37:27 -0800
committerJunio C Hamano <gitster@pobox.com>2012-12-22 20:37:27 -0800
commite970ec356bcf09efc959499f083466517188f8b7 (patch)
treeea1a712605e4221d083993b0fd0922e360aa74a1
parent21b340181bc13fd83d25f3b5230f59b97c274cec (diff)
parent71ce415dc088f19a0b8d6c8567dfdd6d851842b2 (diff)
downloadgit-e970ec356bcf09efc959499f083466517188f8b7.tar.gz
Merge branch 'sl/readme-gplv2' into maint
* 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.