Skip to main content

Browse the archive

Staging
v0.8.1
Revision 6ecc01f26cc38841c8d0c89f24a260067b462f30 authored by Junio C Hamano on 12 December 2012, 18:06:24 UTC, committed by Junio C Hamano on 27 December 2012, 23:40:09 UTC 
git(1): show link to contributor summary page
 
We earlier removed a link to list of contributors that pointed to a
defunct page; let's use a working one from Ohloh.net to replace it
instead.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 2b05d9f
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 char **);

#endif
back to top