git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ralf Thielow <ralf.thielow@gmail.com>
To: git@vger.kernel.org, gitster@pobox.com
Cc: kuleshovmail@gmail.com, jn.avila@free.fr,
	worldhello.net@gmail.com, Ralf Thielow <ralf.thielow@gmail.com>
Subject: [PATCH] show-branch: fix indentation of usage string
Date: Tue, 20 Jan 2015 20:30:28 +0100	[thread overview]
Message-ID: <1421782228-24005-1-git-send-email-ralf.thielow@gmail.com> (raw)
In-Reply-To: <CANYiYbGL4A+ut8NjKmq6U8ADVf2M9Lq-5DOG3qxbKBp5srtrJQ@mail.gmail.com>

Noticed-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Ralf Thielow <ralf.thielow@gmail.com>
---
Jiang Xin <worldhello.net@gmail.com> wrote:
> 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA <jn.avila@free.fr>:
> Yes, it's wrong to using mixed tabs and spaces in the message. It comes
> from commit v2.0.5-5-g9990273, and it should be fixed.

This also breaks the indentation of the command output.

 builtin/show-branch.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 691eeda..365228a 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -7,9 +7,9 @@
 
 static const char* show_branch_usage[] = {
     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>)...]"),
+       "		[--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>]"),
     NULL
 };
-- 
2.3.0.rc0.211.g05e7197

  reply	other threads:[~2015-01-20 19:30 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-01-18 16:18 [L10N] Startup of Git 2.3.0 l10n round 2 Jiang Xin
2015-01-20 19:30 ` Ralf Thielow [this message]
2015-01-21  0:13   ` [PATCH] show-branch: fix indentation of usage string Junio C Hamano
2015-01-21  7:49   ` [PATCH] l10n: correct indentation of show-branch usage Jiang Xin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1421782228-24005-1-git-send-email-ralf.thielow@gmail.com \
    --to=ralf.thielow@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jn.avila@free.fr \
    --cc=kuleshovmail@gmail.com \
    --cc=worldhello.net@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).