diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2012-10-26 22:53:49 +0700 |
|---|---|---|
| committer | Jeff King <peff@peff.net> | 2012-10-29 03:08:30 -0400 |
| commit | db699a8a1f2c8063620efae41e66786c11a31d8f (patch) | |
| tree | 354121c11f07e75d89757593f2d9aae1909056bf /commit.c | |
| parent | 2cfceefaca16d64baecf0ba9bcd4e05229d9c31b (diff) | |
| download | git-db699a8a1f2c8063620efae41e66786c11a31d8f.tar.gz | |
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>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions