Andrew's git / gitweb.git / resolve-undo.h
?
resolve-undo.hon commit sequencer: change the way skip_unnecessary_picks() returns its result (d4ed5d7)
   1#ifndef RESOLVE_UNDO_H
   2#define RESOLVE_UNDO_H
   3
   4struct resolve_undo_info {
   5        unsigned int mode[3];
   6        struct object_id oid[3];
   7};
   8
   9extern void record_resolve_undo(struct index_state *, struct cache_entry *);
  10extern void resolve_undo_write(struct strbuf *, struct string_list *);
  11extern struct string_list *resolve_undo_read(const char *, unsigned long);
  12extern void resolve_undo_clear_index(struct index_state *);
  13extern int unmerge_index_entry_at(struct index_state *, int);
  14extern void unmerge_index(struct index_state *, const struct pathspec *);
  15extern void unmerge_marked_index(struct index_state *);
  16
  17#endif