Merge branch 'ah/usage-strings'

* ah/usage-strings:
standardize usage info string format

diff --cc Documentation/CodingGuidelines
Simple merge

diff --cc builtin/apply.c
Simple merge

diff --cc builtin/blame.c
Simple merge

diff --cc builtin/cat-file.c
Simple merge

diff --cc builtin/commit.c
Simple merge

diff --cc builtin/for-each-ref.c
Simple merge

diff --cc builtin/log.c
index a131992c52f96daeb7c72b447c5ed6929c01a96a,d65d96a7a349e3902ca080c39a3de48d9a5a55cb..dd8f3fcfc451780b244f6e6fd9e77298f484ad1a
--- 1/builtin/log.c
--- 2/builtin/log.c
+++ b/builtin/log.c
@@@ -38,8 -38,8 +38,8 @@@ static const char *fmt_patch_subject_pr
  static const char *fmt_pretty;
  
  static const char * const builtin_log_usage[] = {
 -      N_("git log [<options>] [<revision-range>] [[--] <path>...]\n")
 -      N_("   or: git show [<options>] <object>..."),
 +      N_("git log [<options>] [<revision range>] [[--] <path>...]"),
-       N_("git show [options] <object>..."),
++      N_("git show [<options>] <object>..."),
        NULL
  };
  

diff --cc builtin/remote.c
Simple merge

diff --cc builtin/show-branch.c
index 365228aa8d805bdf86a6eecccdc088068ba000d2,e9b37dc479996323059b4bdfaa2894ef5828b20c..f3fb5fb2bf28019dafcbd2bfbd6b1a024aa6da2f
--- 1/builtin/show-branch.c
--- 2/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@@ -6,11 -6,8 +6,11 @@@
  #include "parse-options.h"
  
  static const char* show_branch_usage[] = {
-     N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order]\n"
 -    N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
++    N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
 +       "              [--current] [--color[=<when>] | --no-color] [--sparse]\n"
 +       "              [--more=<n> | --list | --independent | --merge-base]\n"
 +       "              [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
-     N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"),
+     N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"),
      NULL
  };
  

diff --cc git.c
Simple merge