X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=commit.h;h=3114bd1781c3c5e735dfc1b1a7b4131270992f14;hb=27c67292019e8d49c5b5e3ce73c59c03c08b2ada;hp=b3c3bb70c5e737ed18df7ca665c85e339e1f3292;hpb=0c529e44d3ddd5c947ed33eace8ec6818e47afcb;p=git.git diff --git a/commit.h b/commit.h index b3c3bb70c..3114bd178 100644 --- a/commit.h +++ b/commit.h @@ -145,8 +145,6 @@ struct commit_graft *read_graft_line(char *buf, int len); int register_commit_graft(struct commit_graft *, int); struct commit_graft *lookup_commit_graft(const unsigned char *sha1); -const unsigned char *lookup_replace_object(const unsigned char *sha1); - extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2, int cleanup); extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup); extern struct commit_list *get_octopus_merge_bases(struct commit_list *in); @@ -161,7 +159,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads, int is_descendant_of(struct commit *, struct commit_list *); int in_merge_bases(struct commit *, struct commit **, int); -extern int interactive_add(int argc, const char **argv, const char *prefix); +extern int interactive_add(int argc, const char **argv, const char *prefix, int patch); extern int run_add_interactive(const char *revision, const char *patch_mode, const char **pathspec);