diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-28 21:52:28 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-28 21:52:28 -0700 |
| commit | 99f5b0845ac53f9f6e845fe4401e68fcef154690 (patch) | |
| tree | 5647dacc82fa90cb8de24ec4f4b9abea249707cf /builtin/merge.c | |
| parent | Merge branch 'sb/notes-parse-opt' (diff) | |
| parent | revert: fix tiny memory leak in cherry-pick --ff (diff) | |
| download | tgif-99f5b0845ac53f9f6e845fe4401e68fcef154690.tar.xz | |
Merge branch 'cc/cherry-pick-ff'
* cc/cherry-pick-ff:
revert: fix tiny memory leak in cherry-pick --ff
rebase -i: use new --ff cherry-pick option
Documentation: describe new cherry-pick --ff option
cherry-pick: add tests for new --ff option
revert: add --ff option to allow fast forward when cherry-picking
builtin/merge: make checkout_fast_forward() non static
parse-options: add parse_options_concat() to concat options
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; |