Merge branch 'ab/merge-file-prefix'

diff --git a/send-pack.h b/send-pack.h
index 8e843924cf5beba6ee680149910cd357cffc73e3..b6646488aaf93814c5053d79528c1b5a4d19bcb5 100644 (file)
--- a/send-pack.h
+++ b/send-pack.h
@@ -2,6 +2,7 @@
 #define SEND_PACK_H
 
 struct send_pack_args {
+       const char *url;
        unsigned verbose:1,
                quiet:1,
                porcelain:1,
@@ -11,7 +12,9 @@ struct send_pack_args {
                use_thin_pack:1,
                use_ofs_delta:1,
                dry_run:1,
-               stateless_rpc:1;
+               push_cert:1,
+               stateless_rpc:1,
+               atomic:1;
 };
 
 int send_pack(struct send_pack_args *args,