Skip to main content

Browse the archive

https://github.com/git/git
05 April 2024, 19:32:26 UTC
Revision 1df9bf46d656970d0db254cb7faab0d0505802e0 authored by Jonathan Nieder on 10 December 2011, 12:47:36 UTC, committed by Junio C Hamano on 12 December 2011, 21:06:36 UTC 
revert: give --continue handling its own function
 
This makes pick_revisions() a little shorter and easier to read
straight through.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent b15aa97
Raw File
Tip revision: 1df9bf46d656970d0db254cb7faab0d0505802e0 authored by Jonathan Nieder on 10 December 2011, 12:47:36 UTC
revert: give --continue handling its own function
Tip revision: 1df9bf4
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 char **);

#endif
back to top