Merge branch 'nd/style-opening-brace'

Code clean-up.

* nd/style-opening-brace:
  style: the opening '{' of a function is in a separate line

diff --cc bisect.c
Simple merge

diff --cc builtin/push.c
Simple merge

diff --cc convert.c
Simple merge

diff --cc diff.c
Simple merge

diff --cc git.c
Simple merge

diff --cc sequencer.c
Simple merge

diff --cc userdiff.c
Simple merge