Merge branch 'ah/usage-strings' into maint

A few usage string updates.

* ah/usage-strings:
  blame, log: format usage strings similarly to those in documentation

diff --cc builtin/blame.c
index ff97825,5710dcb..b3e948e
--- 1/builtin/blame.c
--- 2/builtin/blame.c
+++ b/builtin/blame.c
@@@ -26,9 -26,8 +26,9 @@@
  #include "userdiff.h"
  #include "line-range.h"
  #include "line-log.h"
 +#include "dir.h"
  
- static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] file");
+ static char blame_usage[] = N_("git blame [<options>] [<rev-opts>] [<rev>] [--] <file>");
  
  static const char *blame_opt_usage[] = {
        blame_usage,