Re-order pg_upgrade 'help' options to be alphabetical.

diff --git a/contrib/pg_upgrade/option.c b/contrib/pg_upgrade/option.c
index 83e0ea6c151af337c1a26bf58d9d53740fd9342e..3a04b3078c42783c9c2db2c5d65919eb9368de2a 100644 (file)
--- a/contrib/pg_upgrade/option.c
+++ b/contrib/pg_upgrade/option.c
@@ -226,19 +226,18 @@ usage(migratorContext *ctx)
        printf(_("\nUsage: pg_upgrade [OPTIONS]...\n\
 \n\
 Options:\n\
- -d, --old-datadir=OLDDATADIR    old cluster data directory\n\
- -D, --new-datadir=NEWDATADIR    new cluster data directory\n\
  -b, --old-bindir=OLDBINDIR      old cluster executable directory\n\
  -B, --new-bindir=NEWBINDIR      new cluster executable directory\n\
- -p, --old-port=portnum          old cluster port number (default %d)\n\
- -P, --new-port=portnum          new cluster port number (default %d)\n\
- \n\
- -u, --user=username             clusters superuser (default \"%s\")\n\
  -c, --check                     check clusters only, don't change any data\n\
+ -d, --old-datadir=OLDDATADIR    old cluster data directory\n\
+ -D, --new-datadir=NEWDATADIR    new cluster data directory\n\
  -g, --debug                     enable debugging\n\
  -G, --debugfile=DEBUGFILENAME   output debugging activity to file\n\
  -k, --link                      link instead of copying files to new cluster\n\
  -l, --logfile=LOGFILENAME       log session activity to file\n\
+ -p, --old-port=portnum          old cluster port number (default %d)\n\
+ -P, --new-port=portnum          new cluster port number (default %d)\n\
+ -u, --user=username             clusters superuser (default \"%s\")\n\
  -v, --verbose                   enable verbose output\n\
  -V, --version                   display version information, then exit\n\
  -h, --help                      show this help, then exit\n\