File: resolve-undo.h

package info (click to toggle)
cgit 1.2.1%2Bgit2.18.0-1
  • links: PTS, VCS
  • area: main
  • in suites: buster
  • size: 37,580 kB
  • sloc: ansic: 207,716; sh: 172,917; perl: 28,960; tcl: 21,663; python: 6,441; makefile: 3,642; php: 120; asm: 98; csh: 45; ruby: 24; lisp: 12
file content (17 lines) | stat: -rw-r--r-- 610 bytes parent folder | download 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
 
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

struct resolve_undo_info {
	unsigned int mode[3];
	struct object_id oid[3];
};

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