Merge branch 'sb/parse-options-codeformat'

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

Junio C Hamano committed Aug 12, 2015 at 14:09 UTC 535efaf6beb039b9f3b6f6c0f2b526eb8d02f99b

No changes.