X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=e519f98e7013b1d0ff3e83cb3b4c730563d8fe3c;hp=95f057eae21b2289df61cc373b354fe0885a07a6;hb=b2a9fcd5cfd1bf84321b8bf53b37e7fb98618d6e;hpb=e3046c688be7a28e7dcfbce5fa54074917fd9904

diff --git a/notmuch.c b/notmuch.c
index 95f057ea..e519f98e 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -307,7 +307,10 @@ usage (FILE *out)
     command_t *command;
     unsigned int i;
 
-    fprintf (out, "Usage: notmuch <command> [args...]\n");
+    fprintf (out,
+	     "Usage: notmuch --help\n"
+	     "       notmuch --version\n"
+	     "       notmuch <command> [args...]\n");
     fprintf (out, "\n");
     fprintf (out, "Where <command> and [args...] are as follows:\n");
     fprintf (out, "\n");
@@ -457,6 +460,14 @@ main (int argc, char *argv[])
     if (argc == 1)
 	return notmuch (local);
 
+    if (STRNCMP_LITERAL (argv[1], "--help") == 0)
+	return notmuch_help_command (NULL, 0, NULL);
+
+    if (STRNCMP_LITERAL (argv[1], "--version") == 0) {
+	printf ("notmuch version " STRINGIFY(NOTMUCH_VERSION) "\n");
+	return 0;
+    }
+
     for (i = 0; i < ARRAY_SIZE (commands); i++) {
 	command = &commands[i];