kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Jeff King	5c1753b198	merge: use argv_array when spawning merge strategy This is shorter, and avoids a rather complicated set of allocation and free steps. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2014-06-19 15:20:55 -07:00
Nguyễn Thái Ngọc Duy	db699a8a1f	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>	2012-10-29 03:08:30 -04:00

Author

SHA1

Message

Date

Jeff King

5c1753b198

merge: use argv_array when spawning merge strategy

This is shorter, and avoids a rather complicated set of
allocation and free steps.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

2014-06-19 15:20:55 -07:00

Nguyễn Thái Ngọc Duy

db699a8a1f

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>

2012-10-29 03:08:30 -04:00

2 Commits (779c99fd68dcdaff7d996a1985914154a36a272c)