| commit | db699a8a1f2c8063620efae41e66786c11a31d8f | |
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | |
| Fri, 26 Oct 2012 15:53:49 +0000 (26 22:53 +0700) | ||
| committer | Jeff King <peff@peff.net> | |
| Mon, 29 Oct 2012 07:08:30 +0000 (29 03:08 -0400) | ||
| tree | 354121c11f07e75d89757593f2d9aae1909056bf | treesnapshot (tar.gz zip) |
| parent | 2cfceefaca16d64baecf0ba9bcd4e05229d9c31b | commitdiff |
Move try_merge_command and checkout_fast_forward to libgit.a
These functions are called in sequencer.c, which is part of
libgit.a. This makes libgit.a potentially require builtin/merge.c for
external git commands.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
These functions are called in sequencer.c, which is part of
libgit.a. This makes libgit.a potentially require builtin/merge.c for
external git commands.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>