diff options
| -rw-r--r-- | builtin-merge.c | 2 | ||||
| -rw-r--r-- | cache.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/builtin-merge.c b/builtin-merge.c index 3aaec7bed7..c043066845 100644 --- a/builtin-merge.c +++ b/builtin-merge.c @@ -667,7 +667,7 @@ static int count_unmerged_entries(void) return ret; } -static int checkout_fast_forward(unsigned char *head, unsigned char *remote) +int checkout_fast_forward(const unsigned char *head, const unsigned char *remote) { struct tree *trees[MAX_UNPACK_TREES]; struct unpack_trees_options opts; @@ -1040,4 +1040,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix); char *alias_lookup(const char *alias); int split_cmdline(char *cmdline, const char ***argv); +/* builtin/merge.c */ +int checkout_fast_forward(const unsigned char *from, const unsigned char *to); + #endif /* CACHE_H */ |