git-rebase.txt: document incompatible options

diff --git a/commit.h b/commit.h
index 23a3f364edec6b609a39f15518cfda06af69e487..c3af512f8b1b90b3963d0921f7ec0d0a43a2fcbe 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -19,7 +19,6 @@ struct commit_list {
 struct commit {
        struct object object;
        void *util;
-       unsigned int index;
        timestamp_t date;
        struct commit_list *parents;
 
@@ -30,6 +29,7 @@ struct commit {
         */
        struct tree *maybe_tree;
        uint32_t graph_pos;
+       unsigned int index;
 };
 
 extern int save_commit_buffer;
@@ -303,10 +303,10 @@ extern const char *find_commit_header(const char *msg, const char *key,
 /* Find the end of the log message, the right place for a new trailer. */
 extern int ignore_non_trailer(const char *buf, size_t len);
 
-typedef void (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
+typedef int (*each_mergetag_fn)(struct commit *commit, struct commit_extra_header *extra,
                                 void *cb_data);
 
-extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
+extern int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data);
 
 struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */