rebase --rebase-merges: adjust man page for octopus support

diff --git a/tag.h b/tag.h
index 2abb3726fb5c289a5ef2c90716ec1a01f28169d6..9057d76a50639d65aae1340b752d2daa7dc67aa9 100644 (file)
--- a/tag.h
+++ b/tag.h
@@ -12,12 +12,13 @@ struct tag {
        timestamp_t date;
 };
 
-extern struct tag *lookup_tag(const unsigned char *sha1);
+extern struct tag *lookup_tag(const struct object_id *oid);
 extern int parse_tag_buffer(struct tag *item, const void *data, unsigned long size);
 extern int parse_tag(struct tag *item);
+extern void release_tag_memory(struct tag *t);
 extern struct object *deref_tag(struct object *, const char *, int);
 extern struct object *deref_tag_noverify(struct object *);
-extern int gpg_verify_tag(const unsigned char *sha1,
+extern int gpg_verify_tag(const struct object_id *oid,
                const char *name_to_report, unsigned flags);
 
 #endif /* TAG_H */