Skip to main content

Browse the archive

Revision 9c6be8b5ab89bcc800d500f84358e4e63ee88042 authored by Junio C Hamano on 20 October 2014, 19:25:15 UTC, committed by Junio C Hamano on 20 October 2014, 19:25:16 UTC 
Merge branch 'ss/contrib-subtree-contacts'
 
* ss/contrib-subtree-contacts:
  contacts: add a Makefile to generate docs and install
  subtree: add an install-html target
2 parent s b946576 + 2ea40f0
Raw File
resolve-undo.h 
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

struct resolve_undo_info {
	unsigned int mode[3];
	unsigned char sha1[3][20];
};

extern void record_resolve_undo(struct index_state *, struct cache_entry *);
extern void resolve_undo_write(struct strbuf *, struct string_list *);
extern struct string_list *resolve_undo_read(const char *, unsigned long);
extern void resolve_undo_clear_index(struct index_state *);
extern int unmerge_index_entry_at(struct index_state *, int);
extern void unmerge_index(struct index_state *, const struct pathspec *);
extern void unmerge_marked_index(struct index_state *);

#endif
back to top