aboutsummaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2013-11-10 09:20:52 -0500
committerPeter Eisentraut <peter_e@gmx.net>2013-11-10 14:48:29 -0500
commit001e114b8d59f4eaf2a314a2bc5e57078afdf82f (patch)
tree606fa622be346ef917886a29aea7e17383e00d31 /src/tools
parentdca09ac53329e92d73f45674957c26d3d7ae5117 (diff)
downloadpostgresql-001e114b8d59f4eaf2a314a2bc5e57078afdf82f.tar.gz
postgresql-001e114b8d59f4eaf2a314a2bc5e57078afdf82f.zip
Fix whitespace issues found by git diff --check, add gitattributes
Set per file type attributes in .gitattributes to fine-tune whitespace checks. With the associated cleanups, the tree is now clean for git
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/RELEASE_CHANGES6
-rwxr-xr-xsrc/tools/copyright.pl1
-rw-r--r--src/tools/msvc/pgflex.pl1
-rw-r--r--src/tools/pgindent/pgindent.man1
4 files changed, 3 insertions, 6 deletions
diff --git a/src/tools/RELEASE_CHANGES b/src/tools/RELEASE_CHANGES
index 91b38251765..321f37cd374 100644
--- a/src/tools/RELEASE_CHANGES
+++ b/src/tools/RELEASE_CHANGES
@@ -89,7 +89,7 @@ Starting a New Development Cycle
Creating Back-Branch Release Notes
==================================
-* Run src/tools/git_changelog to generate a list of relevant commits.
+* Run src/tools/git_changelog to generate a list of relevant commits.
You can also run 'git log' in each branch. Be sure to use the --since
branch tag and not the release date, as commits could have been done
between branch stamping and the release date.
@@ -99,9 +99,9 @@ Creating Back-Branch Release Notes
should include more small change details because testing is limited.
* Copy this into older branches' release-N.N.sgml files, then remove
- items that do not apply based on commit logs for that branch.
+ items that do not apply based on commit logs for that branch.
-* Add any older branch commits not in the newest branch. This can be
+* Add any older branch commits not in the newest branch. This can be
accomplished by diff'ing the newest and older branch commit logs and
looking for lines that only appear in the older branch, e.g.:
diff --git a/src/tools/copyright.pl b/src/tools/copyright.pl
index f7e80fb00e5..bd6f3adcb16 100755
--- a/src/tools/copyright.pl
+++ b/src/tools/copyright.pl
@@ -65,4 +65,3 @@ print
"Manually update doc/src/sgml/legal.sgml and src/interfaces/libpq/libpq.rc.in too.\n";
print
"Also update ./COPYRIGHT and doc/src/sgml/legal.sgml in all back branches.\n";
-
diff --git a/src/tools/msvc/pgflex.pl b/src/tools/msvc/pgflex.pl
index 7e4c0f90b70..c5b90adb81d 100644
--- a/src/tools/msvc/pgflex.pl
+++ b/src/tools/msvc/pgflex.pl
@@ -92,4 +92,3 @@ else
{
exit $? >> 8;
}
-
diff --git a/src/tools/pgindent/pgindent.man b/src/tools/pgindent/pgindent.man
index f3a68acc2a6..4765d428b60 100644
--- a/src/tools/pgindent/pgindent.man
+++ b/src/tools/pgindent/pgindent.man
@@ -42,4 +42,3 @@ case only these files will be changed, and nothing else will be touched. If the
first non-option argument is not a .c or .h file, it is treated as the name
of a typedefs file for legacy reasons, but this use is deprecated - use the
--typedefs option instead.
-