THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Git Source Code Mirror - This is a publish-only repository and all pull requests are ignored. Please follow Documentation/SubmittingPatches procedure for any of your improvements.
git
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

20 lines
581B

  1. #ifndef RESOLVE_UNDO_H
  2. #define RESOLVE_UNDO_H
  3. #include "cache.h"
  4. struct resolve_undo_info {
  5. unsigned int mode[3];
  6. struct object_id oid[3];
  7. };
  8. void record_resolve_undo(struct index_state *, struct cache_entry *);
  9. void resolve_undo_write(struct strbuf *, struct string_list *);
  10. struct string_list *resolve_undo_read(const char *, unsigned long);
  11. void resolve_undo_clear_index(struct index_state *);
  12. int unmerge_index_entry_at(struct index_state *, int);
  13. void unmerge_index(struct index_state *, const struct pathspec *);
  14. void unmerge_marked_index(struct index_state *);
  15. #endif