Merge branch 'sb/merge-friendly'

diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index ec1eda20de8d510a9acfd981150a5f1a438a0fe4..06c42b042d999856aacb9e156cffc39eb8dbce3f 100755 (executable)
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -4,7 +4,7 @@ echo "/* Automatically generated by $0 */
 struct cmdname_help
 {
     char name[16];
-    char help[64];
+    char help[80];
 };
 
 struct cmdname_help common_cmds[] = {"
@@ -12,6 +12,7 @@ struct cmdname_help common_cmds[] = {"
 sort <<\EOF |
 add
 apply
+archive
 bisect
 branch
 checkout