diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-03-06 23:34:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-03-07 10:58:46 +0300 |
commit | cac42b266a5868fc54b2e54986fa2689676ec447 (patch) | |
tree | cc6a21fd29ed1965b6277e6357e8e849a3eceb0b /cache.h | |
parent | 8b74d75cd26d28d38d2ff88267585fc308b89cef (diff) |
builtin/merge: make checkout_fast_forward() non static
and also export it in "cache.h".
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'cache.h')
-rw-r--r-- | cache.h | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -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 */ |