Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index 06c42b042d999856aacb9e156cffc39eb8dbce3f..17df47b95067449f03039b8ecd7715701302fa68 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -7,7 +7,7 @@ struct cmdname_help
     char help[80];
 };
 
-struct cmdname_help common_cmds[] = {"
+static struct cmdname_help common_cmds[] = {"
 
 sort <<\EOF |
 add
@@ -22,7 +22,7 @@ commit
 diff
 fetch
 grep
-init-db
+init
 log
 merge
 mv
@@ -37,7 +37,6 @@ show
 show-branch
 status
 tag
-verify-tag
 EOF
 while read cmd
 do