Drats, I made a typo.
OK to push this?

commit 9ccc49f2a7b5daf86a0a8683c159798890ef1dcc
Author: Pádraig Brady <p...@draigbrady.com>
Date:   Mon Dec 20 07:49:07 2010 +0000

    maint: fix a typo in sort --parallel help message

    Also fix up Chen Guo's emails
    * src/sort.c (usage): Add a missing "of"
    * THANKS: Add Chen Guo
    * .mailmap: Add Chen Guo's UCLA address

diff --git a/.mailmap b/.mailmap
index 5a07abd..d4fcef5 100644
--- a/.mailmap
+++ b/.mailmap
@@ -9,3 +9,4 @@ Evan Hunt <etha...@armory.com> Evan Hunt <j...@meyering.net>
 <p...@draigbrady.com> <p...@draigbrady.com  (trivial change)>
 Pádraig Brady <p...@draigbrady.com> <p...@draigbrady.com>
 <chen.guo.0...@gmail.com> <cheng...@yahoo.com>
+<chen.guo.0...@gmail.com> <cheng...@ucla.edu>
diff --git a/THANKS b/THANKS
index b17f4bf..484c1b6 100644
--- a/THANKS
+++ b/THANKS
@@ -225,6 +225,7 @@ Germano Leichsenring                
germ...@jedi.cs.kobe-u.ac.jp
 Gilles Espinasse                    g....@free.fr
 Glen Lenker                         glen.len...@gmail.com
 Göran Uddeborg                      goe...@uddeborg.se
+Chen guo                            chen.guo.0...@gmail.com
 Guochun Shi                         g...@ncsa.uiuc.edu
 GOTO Masanori                       go...@debian.or.jp
 Greg Louis                          glo...@dynamicro.on.ca
diff --git a/src/sort.c b/src/sort.c
index 6cc0588..f193e04 100644
--- a/src/sort.c
+++ b/src/sort.c
@@ -459,7 +459,7 @@ Other options:\n\
   -t, --field-separator=SEP  use SEP instead of non-blank to blank 
transition\n\
   -T, --temporary-directory=DIR  use DIR for temporaries, not $TMPDIR or %s;\n\
                               multiple options specify multiple directories\n\
-      --parallel=N          change the number sorts run concurrently to N\n\
+      --parallel=N          change the number of sorts run concurrently to N\n\

Reply via email to