From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Feb 2015 21:44:19 +0000 (-0800)
Subject: Merge branch 'ah/usage-strings'
X-Git-Tag: v2.4.0-rc0~128
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/bb831db6774aaa733199360dc7af6f3ce375fc20

Merge branch 'ah/usage-strings'

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

bb831db6774aaa733199360dc7af6f3ce375fc20
diff --cc builtin/log.c
index a131992c52,d65d96a7a3..dd8f3fcfc4
--- a/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/show-branch.c
index 365228aa8d,e9b37dc479..f3fb5fb2bf
--- a/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
  };