diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-03 09:34:00 -0700 |
| commit | 97fefaf6d32d3e8dbb78778f62fcdd980dcf46c7 (patch) | |
| tree | 410a80ba3143ff806a0bfbba469b42a5950a0e18 /resolve-undo.h | |
| parent | 961c5129d53554d4d71003899fab8dda846d7c2a (diff) | |
| parent | e721c1544f9166e8f08a7f8c0e6178ea3a45e255 (diff) | |
| download | git-97fefaf6d32d3e8dbb78778f62fcdd980dcf46c7.tar.xz | |
Merge branch 'nd/checkout-paths-reduce-match-pathspec-calls'
Consolidate repeated pathspec matches on the same paths, while
fixing a bug in "git checkout dir/" code started from an unmerged
index.
* nd/checkout-paths-reduce-match-pathspec-calls:
checkout: avoid unnecessary match_pathspec calls
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index 845876911d..7a30206aad 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -12,5 +12,6 @@ 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 **); +extern void unmerge_marked_index(struct index_state *); #endif |