Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-12-19 02:15:17 +0300
committerJunio C Hamano <gitster@pobox.com>2020-12-19 02:15:17 +0300
commit263dc03b820d4b1f1fc3e2e70618124034f5cd2b (patch)
treec8e9119cd2faa1cce1bde4ea1f528d8715c0c5d3
parent772bdcd4296b259d52aafb0badd79872e9db3bb3 (diff)
parentfcedbc1cf60402905f2a1bac4c7c27fb7125871a (diff)
Merge branch 'dd/doc-p4-requirements-update'
Doc update. * dd/doc-p4-requirements-update: doc: mention Python 3.x supports
-rw-r--r--INSTALL3
-rw-r--r--Makefile2
2 files changed, 2 insertions, 3 deletions
diff --git a/INSTALL b/INSTALL
index 9ba33e6a14..8474ad01bf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -165,8 +165,7 @@ Issues of note:
use English. Under autoconf the configure script will do this
automatically if it can't find libintl on the system.
- - Python version 2.4 or later (but not 3.x, which is not
- supported by Perforce) is needed to use the git-p4 interface
+ - Python version 2.7 or later is needed to use the git-p4 interface
to Perforce.
- Some platform specific issues are dealt with Makefile rules,
diff --git a/Makefile b/Makefile
index 348f3bbf0b..7b64106930 100644
--- a/Makefile
+++ b/Makefile
@@ -303,7 +303,7 @@ all::
# modules, instead of the fallbacks shipped with Git.
#
# Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python
-# but /usr/bin/python2.7 on some platforms).
+# but /usr/bin/python2.7 or /usr/bin/python3 on some platforms).
#
# Define NO_PYTHON if you do not want Python scripts or libraries at all.
#