diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-06 21:34:41 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-06 23:58:46 -0800 |
| commit | cac42b266a5868fc54b2e54986fa2689676ec447 (patch) | |
| tree | cc6a21fd29ed1965b6277e6357e8e849a3eceb0b /builtin-merge.c | |
| parent | parse-options: add parse_options_concat() to concat options (diff) | |
| download | tgif-cac42b266a5868fc54b2e54986fa2689676ec447.tar.xz | |
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 'builtin-merge.c')
| -rw-r--r-- | builtin-merge.c | 2 |
1 files changed, 1 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; |