summaryrefslogtreecommitdiff
path: root/builtin/fmt-merge-msg.c
diff options
context:
space:
mode:
authorDimitrios Christidis <dimitrios@christidis.me>2017-07-25 13:06:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-07-25 19:11:18 (GMT)
commitedd64ef4f7f5e90e66210d375fee1b0ae555cb19 (patch)
tree94c7c6b0bf7fd5609a87f9e64a061852a57bd7f5 /builtin/fmt-merge-msg.c
parent95d67879735cfecfdd85f89e59d993c5b4de8835 (diff)
downloadgit-edd64ef4f7f5e90e66210d375fee1b0ae555cb19.zip
git-edd64ef4f7f5e90e66210d375fee1b0ae555cb19.tar.gz
git-edd64ef4f7f5e90e66210d375fee1b0ae555cb19.tar.bz2
fmt-merge-msg: fix coding style
Align argument list and place opening brace on its own line. Signed-off-by: Dimitrios Christidis <dimitrios@christidis.me> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/fmt-merge-msg.c')
-rw-r--r--builtin/fmt-merge-msg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index efab62f..f7e2ff3 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -407,7 +407,8 @@ static void shortlog(const char *name,
}
static void fmt_merge_msg_title(struct strbuf *out,
- const char *current_branch) {
+ const char *current_branch)
+{
int i = 0;
char *sep = "";