File: resolve-undo.h

package info (click to toggle)
cgit 1.2.3%2Bgit20221219.50.91f2590%2Bgit2.39.1-1
  • links: PTS, VCS
  • area: main
  • in suites: bookworm
  • size: 52,764 kB
  • sloc: ansic: 284,865; sh: 234,485; perl: 30,919; tcl: 22,154; makefile: 4,200; python: 3,757; javascript: 772; csh: 45; ruby: 43; lisp: 12
file content (19 lines) | stat: -rw-r--r-- 581 bytes parent folder | download | duplicates (4) 
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
 
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H

#include "cache.h"

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

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

#endif