diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-12-25 22:57:11 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-12-26 04:10:10 +0300 |
| commit | 4421a8235783d0664faa9a1d45be114fd7ad8206 (patch) | |
| tree | 90505e56f05e1125140a21516a19667176da6e73 /resolve-undo.h | |
| parent | 4a39f79d3482cd844443b4ef9a8ef9b3d72faa5b (diff) | |
resolve-undo: "checkout -m path" uses resolve-undo information
Once you resolved conflicts by "git add path", you cannot recreate the
conflicted state with "git checkout -m path", because you lost information
from higher stages in the index when you resolved them.
Since we record the necessary information in the resolve-undo index
extension these days, we can reproduce the unmerged state in the index and
check it out.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index 74194d0eba..e4e5c1b1ad 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -10,5 +10,7 @@ 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(void *, 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 |