X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch.c;h=3b743a903cf78ca4c48f60caef64eba5aee77f20;hp=dca8d3829f6afe8f9057dbba41d366c942b808ce;hb=9d9aeb7c71a52b67519f567c34acc3cf3bec6fd2;hpb=6ce2bf68f53fec4302121763e588c33c7cd86a9c

diff --git a/notmuch.c b/notmuch.c
index dca8d382..3b743a90 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -52,7 +52,7 @@ static const char search_terms_help[] =
     "\t\t\tto:<name-or-address>\n"
     "\t\t\tsubject:<word-or-quoted-phrase>\n"
     "\t\t\tattachment:<word>\n"
-    "\t\t\ttag:<tag>\n"
+    "\t\t\ttag:<tag> (or is:<tag>)\n"
     "\t\t\tid:<message-id>\n"
     "\t\t\tthread:<thread-id>\n"
     "\n"
@@ -66,7 +66,7 @@ static const char search_terms_help[] =
     "\t\tthe subject of an email. Quoted phrases are supported when\n"
     "\t\tsearching with: subject:\"this is a phrase\".\n"
     "\n"
-    "\t\tFor tag:, valid tag values include \"inbox\" and \"unread\"\n"
+    "\t\tFor tag: and is:, valid tag values include \"inbox\" and \"unread\"\n"
     "\t\tby default for new messages added by \"notmuch new\" as well\n"
     "\t\tas any other tag values added manually with \"notmuch tag\".\n"
     "\n"
@@ -307,7 +307,9 @@ usage (FILE *out)
     command_t *command;
     unsigned int i;
 
-    fprintf (out, "Usage: notmuch <command> [args...]\n");
+    fprintf (out,
+	     "Usage: notmuch --help\n"
+	     "       notmuch <command> [args...]\n");
     fprintf (out, "\n");
     fprintf (out, "Where <command> and [args...] are as follows:\n");
     fprintf (out, "\n");
@@ -457,6 +459,9 @@ 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);
+
     for (i = 0; i < ARRAY_SIZE (commands); i++) {
 	command = &commands[i];