aboutsummaryrefslogtreecommitdiff
path: root/src/bin/psql/help.c
diff options
context:
space:
mode:
authorRobert Haas <rhaas@postgresql.org>2012-08-09 09:59:45 -0400
committerRobert Haas <rhaas@postgresql.org>2012-08-09 10:02:50 -0400
commitbe690e291d59e8d0c9f4df59abe09f1ff6cc0da9 (patch)
tree7caef7285152bac1818ff8665808224093caa184 /src/bin/psql/help.c
parent92ec0370eb65c4f059f2b60ee6e458b312bb7cbf (diff)
downloadpostgresql-be690e291d59e8d0c9f4df59abe09f1ff6cc0da9.tar.gz
postgresql-be690e291d59e8d0c9f4df59abe09f1ff6cc0da9.zip
Make psql -1 < file behave as expected.
Previously, the -1 option was silently ignored. Also, emit an error if -1 is used in a context where it won't be respected, to avoid user confusion. Original patch by Fabien COELHO, but this version is quite different from the original submission.
Diffstat (limited to 'src/bin/psql/help.c')
-rw-r--r--src/bin/psql/help.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index 3ebf7cc5262..8793201570d 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -97,7 +97,7 @@ usage(void)
printf(_(" -V, --version output version information, then exit\n"));
printf(_(" -X, --no-psqlrc do not read startup file (~/.psqlrc)\n"));
printf(_(" -1 (\"one\"), --single-transaction\n"
- " execute command file as a single transaction\n"));
+ " execute as a single transaction (if non-interactive)\n"));
printf(_(" -?, --help show this help, then exit\n"));
printf(_("\nInput and output options:\n"));