Merge branch 'mergetool' of git://repo.or.cz/git/mergetool into maint

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 6c59dbd68fc15ddd392086d375c8ecfc35e30c1a..17df47b95067449f03039b8ecd7715701302fa68 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -4,14 +4,15 @@ echo "/* Automatically generated by $0 */
 struct cmdname_help
 {
     char name[16];
-    char help[64];
+    char help[80];
 };
 
-struct cmdname_help common_cmds[] = {"
+static struct cmdname_help common_cmds[] = {"
 
 sort <<\EOF |
 add
 apply
+archive
 bisect
 branch
 checkout
@@ -21,7 +22,7 @@ commit
 diff
 fetch
 grep
-init-db
+init
 log
 merge
 mv
@@ -36,8 +37,6 @@ show
 show-branch
 status
 tag
-verify-tag
-whatchanged
 EOF
 while read cmd
 do