Re: [PATCH] show-branch: fix indentation of usage string

2015-01-20 Thread Junio C Hamano 
Ralf Thielow ralf.thie...@gmail.com writes:

 Noticed-by: Jean-Noël Avila jn.av...@free.fr
 Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
 ---
 Jiang Xin worldhello@gmail.com wrote:
 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA jn.av...@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.

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] show-branch: fix indentation of usage string

2015-01-20 Thread Ralf Thielow 
Noticed-by: Jean-Noël Avila jn.av...@free.fr
Signed-off-by: Ralf Thielow ralf.thie...@gmail.com
---
Jiang Xin worldhello@gmail.com wrote:
 2015-01-18 23:53 GMT+08:00 Jean-Noël AVILA jn.av...@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

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html