Skip to main content

Browse the archive

Revision 27ac2b1f24d034f89e87d79768fe94a4e7559b93 authored by Junio C Hamano on 14 March 2014, 21:27:23 UTC, committed by Junio C Hamano on 14 March 2014, 21:27:23 UTC 
Merge branch 'ta/parse-commit-with-skip-prefix'
 
* ta/parse-commit-with-skip-prefix:
  commit.c: use skip_prefix() instead of starts_with()
2 parent s e8cb499 + 147972b
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