Merge branch 'md/list-objects-filter-combo'

diff --git a/builtin/push.c b/builtin/push.c
index ee1e8420271d93620de98f74a7a515151a69cb23..021dd3b1e48979086de68a434d4eddbbeb074df3 100644 (file)
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -143,7 +143,9 @@ static int push_url_of_remote(struct remote *remote, const char ***url_p)
        return remote->url_nr;
 }
 
-static NORETURN int die_push_simple(struct branch *branch, struct remote *remote) {
+static NORETURN int die_push_simple(struct branch *branch,
+                                   struct remote *remote)
+{
        /*
         * There's no point in using shorten_unambiguous_ref here,
         * as the ambiguity would be on the remote side, not what