Merge branch 'maint'

diff --git a/builtin/archive.c b/builtin/archive.c
index e7965bf1573890b7881ba6043e2bc7bf6c5eb72e..9a1cfd3dac0123cb65d3db7597221a29e9010bd9 100644 (file)
--- a/builtin/archive.c
+++ b/builtin/archive.c
@@ -92,7 +92,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
                        N_("write the archive to this file")),
                OPT_STRING(0, "remote", &remote, N_("repo"),
                        N_("retrieve the archive from remote repository <repo>")),
-               OPT_STRING(0, "exec", &exec, N_("cmd"),
+               OPT_STRING(0, "exec", &exec, N_("command"),
                        N_("path to the remote git-upload-archive command")),
                OPT_END()
        };