From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 21 Jan 2015 00:13:54 GMT
Subject: Re: [PATCH] show-branch: fix indentation of usage string
Message-ID: <xmqqoaptyoql.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1421782228-24005-1-git-send-email-ralf.thielow@gmail.com>

Ralf Thielow <ralf.thielow@gmail.com> writes:

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

Thanks.