Merge branch 'maint'

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index a2913c2a2cd1ec158157ada3e2deb666892b734b..3ef4861d04ed5fed14d31b92e047a03cf5362970 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 echo "/* Automatically generated by $0 */
-struct cmdname_help
-{
+struct cmdname_help {
     char name[16];
     char help[80];
 };
@@ -14,7 +13,7 @@ sort |
 while read cmd
 do
      sed -n '
-     /NAME/,/git-'"$cmd"'/H
+     /^NAME/,/git-'"$cmd"'/H
      ${
             x
             s/.*git-'"$cmd"' - \(.*\)/  {"'"$cmd"'", "\1"},/