From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 16 Jun 2015 21:33:50 +0000 (-0700)
Subject: Merge branch 'ah/usage-strings' into maint
X-Git-Tag: v2.4.4~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6588f82ff6aa8ff7857304c10b18ab062e67bb52;p=thirdparty%2Fgit.git

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
---

6588f82ff6aa8ff7857304c10b18ab062e67bb52
diff --cc builtin/blame.c
index ff978253f1,5710dcbec6..b3e948e757
--- a/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,