resolve-undo.h

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