diff --git a/config/ac_func_accept_argtypes.m4 b/config/ac_func_accept_argtypes.m4
index d1017998ebb27de545a45b0aab7ef91c663d10e2..7a86ccaae578ffe3720f6946cd740f1df356b9d6 100644
--- a/config/ac_func_accept_argtypes.m4
+++ b/config/ac_func_accept_argtypes.m4
@@ -1,7 +1,6 @@
# config/ac_func_accept_argtypes.m4
# This comes from the official Autoconf macro archive at
# <http://research.cys.de/autoconf-archive/>
-# (I removed the $ before the Id CVS keyword below.)
dnl @synopsis AC_FUNC_ACCEPT_ARGTYPES
@@ -21,7 +20,7 @@ dnl
dnl NOTE: This is just a modified version of the AC_FUNC_SELECT_ARGTYPES
dnl macro. Credit for that one goes to David MacKenzie et. al.
dnl
-dnl @version Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $
+dnl @version $Id: ac_func_accept_argtypes.m4,v 1.1 1999/12/03 11:29:29 simons Exp $
dnl @author Daniel Richard G. <skunk@mit.edu>
dnl
diff --git a/config/perl.m4 b/config/perl.m4
index 5c31229a81c362d5659c1cca94d71af35d1ec655..d602a5bb1b0f38dc98fe282c7d5ba979251d219d 100644
--- a/config/perl.m4
+++ b/config/perl.m4
@@ -24,7 +24,7 @@ fi
if test -z "$PERL"; then
AC_MSG_WARN([
-*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** Without Perl you will not be able to build PostgreSQL from Git.
*** You can obtain Perl from any CPAN mirror site.
*** (If you are using the official distribution of PostgreSQL then you do not
*** need to worry about this, because the Perl output is pre-generated.)])
diff --git a/config/prep_buildtree b/config/prep_buildtree
index f9164cfa2fafa588e378839a471b47680e18d8bf..2527812f1264a57062a578a4d5de4f3839301ffd 100644
--- a/config/prep_buildtree
+++ b/config/prep_buildtree
@@ -22,7 +22,7 @@ sourcetree=`cd $1 && pwd`
buildtree=`cd ${2:-'.'} && pwd`
-for item in `find "$sourcetree" -type d \( -name CVS -prune -o -print \)`; do
+for item in `find "$sourcetree" -type d \( \( -name CVS -prune \) -o \( -name .git -prune \) -o -print \)`; do
subdir=`expr "$item" : "$sourcetree\(.*\)"`
if test ! -d "$buildtree/$subdir"; then
mkdir -p "$buildtree/$subdir" || exit 1
diff --git a/config/programs.m4 b/config/programs.m4
index e2eb7e6dbdc00abc14f2bac7db4e98166ba2b084..205b65a5aaf6a176f8e5f6cfce11b1fa3f0fccab 100644
--- a/config/programs.m4
+++ b/config/programs.m4
@@ -27,7 +27,7 @@ fi
if test -z "$BISON"; then
AC_MSG_WARN([
-*** Without Bison you will not be able to build PostgreSQL from CVS nor
+*** Without Bison you will not be able to build PostgreSQL from Git nor
*** change any of the parser definition files. You can obtain Bison from
*** a GNU mirror site. (If you are using the official distribution of
*** PostgreSQL then you do not need to worry about this, because the Bison
@@ -89,7 +89,7 @@ fi
if test x"$pgac_cv_path_flex" = x"no"; then
AC_MSG_WARN([
-*** Without Flex you will not be able to build PostgreSQL from CVS nor
+*** Without Flex you will not be able to build PostgreSQL from Git nor
*** change any of the scanner definition files. You can obtain Flex from
*** a GNU mirror site. (If you are using the official distribution of
*** PostgreSQL then you do not need to worry about this because the Flex
diff --git a/configure b/configure
index 432cd58c8d82be7a10c39cea2829d0e03324d4dd..560cb7c246cc633654a2c73bf1ec749a6601f6f1 100755
--- a/configure
+++ b/configure
@@ -6738,13 +6738,13 @@ fi
if test -z "$BISON"; then
{ $as_echo "$as_me:$LINENO: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from CVS nor
+*** Without Bison you will not be able to build PostgreSQL from Git nor
*** change any of the parser definition files. You can obtain Bison from
*** a GNU mirror site. (If you are using the official distribution of
*** PostgreSQL then you do not need to worry about this, because the Bison
*** output is pre-generated.)" >&5
$as_echo "$as_me: WARNING:
-*** Without Bison you will not be able to build PostgreSQL from CVS nor
+*** Without Bison you will not be able to build PostgreSQL from Git nor
*** change any of the parser definition files. You can obtain Bison from
*** a GNU mirror site. (If you are using the official distribution of
*** PostgreSQL then you do not need to worry about this, because the Bison
@@ -6802,13 +6802,13 @@ fi
$as_echo "$pgac_cv_path_flex" >&6; }
if test x"$pgac_cv_path_flex" = x"no"; then
{ $as_echo "$as_me:$LINENO: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS nor
+*** Without Flex you will not be able to build PostgreSQL from Git nor
*** change any of the scanner definition files. You can obtain Flex from
*** a GNU mirror site. (If you are using the official distribution of
*** PostgreSQL then you do not need to worry about this because the Flex
*** output is pre-generated.)" >&5
$as_echo "$as_me: WARNING:
-*** Without Flex you will not be able to build PostgreSQL from CVS nor
+*** Without Flex you will not be able to build PostgreSQL from Git nor
*** change any of the scanner definition files. You can obtain Flex from
*** a GNU mirror site. (If you are using the official distribution of
*** PostgreSQL then you do not need to worry about this because the Flex
@@ -6889,12 +6889,12 @@ fi
if test -z "$PERL"; then
{ $as_echo "$as_me:$LINENO: WARNING:
-*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** Without Perl you will not be able to build PostgreSQL from Git.
*** You can obtain Perl from any CPAN mirror site.
*** (If you are using the official distribution of PostgreSQL then you do not
*** need to worry about this, because the Perl output is pre-generated.)" >&5
$as_echo "$as_me: WARNING:
-*** Without Perl you will not be able to build PostgreSQL from CVS.
+*** Without Perl you will not be able to build PostgreSQL from Git.
*** You can obtain Perl from any CPAN mirror site.
*** (If you are using the official distribution of PostgreSQL then you do not
*** need to worry about this, because the Perl output is pre-generated.)" >&2;}
diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml
index c9c51fe09cb37e8b177fefd5f81b1c0daf7a4627..23ab3b410bd1fd99bb2e898c17371c1bbcb47aaa 100644
--- a/doc/src/sgml/acronyms.sgml
+++ b/doc/src/sgml/acronyms.sgml
@@ -107,17 +107,6 @@
</listitem>
</varlistentry>
- <varlistentry>
- <term><acronym>CVS</acronym></term>
- <listitem>
- <para>
- <ulink
- url="http://en.wikipedia.org/wiki/Concurrent_Versions_System">Concurrent
- Versions System</ulink>
- </para>
- </listitem>
- </varlistentry>
-
<varlistentry>
<term><acronym>DBA</acronym></term>
<listitem>
@@ -248,6 +237,16 @@
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><acronym>Git</acronym></term>
+ <listitem>
+ <para>
+ <ulink
+ url="http://en.wikipedia.org/wiki/Git_(software)">Git</ulink>
+ </para>
+ </listitem>
+ </varlistentry>
+
<varlistentry>
<term><acronym>GMT</acronym></term>
<listitem>
diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml
index 8fb3cbf08c566a1fe5f97bffa9bbe8b4d85c1e2e..7c80dec6a609f819a5e71c3881f30285ebb6a2de 100644
--- a/doc/src/sgml/external-projects.sgml
+++ b/doc/src/sgml/external-projects.sgml
@@ -17,7 +17,7 @@
projects that are maintained outside the core <productname>PostgreSQL</>
distribution. PgFoundry is built using the GForge software project and is
similar to <ulink url="http://sourceforge.net">SourceForge.net</> in its
- feature set, providing mailing lists, forums, bug tracking, CVS, and web
+ feature set, providing mailing lists, forums, bug tracking, SCM, and web
hosting. If you have a <productname>PostgreSQL</>-related open source
project that you would like to have hosted at PgFoundy, please feel free
to create a new project.
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index a9113374183f37a3235e811dc4e05dc3753ac31e..3299346cb745feff32efd90ae668f6070a639acb 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -46,7 +46,7 @@
<filename>msgmerge</filename>, respectively, in a GNU-compatible
implementation. Later, we will try to arrange it so that if you
use a packaged source distribution, you won't need
- <filename>xgettext</filename>. (If working from CVS, you will still need
+ <filename>xgettext</filename>. (If working from Git, you will still need
it.) <application>GNU Gettext 0.10.36</application> or later is currently recommended.
</para>
diff --git a/src/tools/codelines b/src/tools/codelines
index 9a8e11bf4000d0c40e7dbbbdd02be5ad6c7f8102..11e86accf271d7656f7c53311dc03454e4b6df9d 100755
--- a/src/tools/codelines
+++ b/src/tools/codelines
@@ -3,5 +3,5 @@
# src/tools/codelines
# This script is used to compute the total number of "C" lines in the release
-# This should be run from the top of the CVS tree after a 'make distclean'
+# This should be run from the top of the Git tree after a 'make distclean'
find . -name '*.[chyl]' | xargs cat| wc -l
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 4d070b93030eb6b135955b4ef51cec9a7ab19ec8..784d7884281de8b8f7f390cc13c86aa8615b641c 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -438,6 +438,7 @@ sub CopyIncludeFiles
while (my $d = readdir($D))
{
next if ($d =~ /^\./);
+ next if ($d eq '.git');
next if ($d eq 'CVS');
next unless (-d 'src/include/' . $d);