From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Aug 2015 21:09:57 +0000 (-0700)
Subject: Merge branch 'sb/parse-options-codeformat'
X-Git-Tag: v2.6.0-rc0~73
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/535efaf6beb039b9f3b6f6c0f2b526eb8d02f99b?hp=9ad8474b986b0295df6ba1455daa611a7a49a49e

Merge branch 'sb/parse-options-codeformat'

* sb/parse-options-codeformat:
parse-options: align curly braces for all options
---

diff --git a/parse-options.h b/parse-options.h
index 6ca8388a53..3f1cc3aee0 100644
--- a/parse-options.h
+++ b/parse-options.h
@@ -127,7 +127,7 @@ struct option {
 #define OPT_BOOL(s, l, v, h)        OPT_SET_INT(s, l, v, h, 1)
 #define OPT_HIDDEN_BOOL(s, l, v, h) { OPTION_SET_INT, (s), (l), (v), NULL, \
 				      (h), PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, 1}
-#define OPT_CMDMODE(s, l, v, h, i) { OPTION_CMDMODE, (s), (l), (v), NULL, \
+#define OPT_CMDMODE(s, l, v, h, i)  { OPTION_CMDMODE, (s), (l), (v), NULL, \
 				      (h), PARSE_OPT_NOARG|PARSE_OPT_NONEG, NULL, (i) }
 #define OPT_INTEGER(s, l, v, h)     { OPTION_INTEGER, (s), (l), (v), N_("n"), (h) }
 #define OPT_MAGNITUDE(s, l, v, h)   { OPTION_MAGNITUDE, (s), (l), (v), \