projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2cfceef) | patch
Move try_merge_command and checkout_fast_forward to libgit.a
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Fri, 26 Oct 2012 15:53:49 +0000 (22:53 +0700)
committerJeff King <peff@peff.net>
Mon, 29 Oct 2012 07:08:30 +0000 (03:08 -0400)
commitdb699a8a1f2c8063620efae41e66786c11a31d8f
tree354121c11f07e75d89757593f2d9aae1909056bftree | snapshot
parent2cfceefaca16d64baecf0ba9bcd4e05229d9c31bcommit | diff
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>
Makefile diff | blob | history
builtin/merge.c diff | blob | history
cache.h diff | blob | history
merge-recursive.h diff | blob | history
merge.c [new file with mode: 0644] blob
sequencer.c diff | blob | history
Git—the stupid content tracker