Code

ll-merge: replace flag argument with options struct
authorJonathan Nieder <jrnieder@gmail.com>
Thu, 26 Aug 2010 05:49:53 +0000 (00:49 -0500)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 Aug 2010 16:18:51 +0000 (09:18 -0700)
commit712516bcacacd45b4825ec649f15c3573f6fb42a
treed167bb0edd73ead266dad5914a2d1d49276cf4f0
parent635a7bb1d807390bedfc1147d2052e8423bcd1e0
ll-merge: replace flag argument with options struct

Keeping track of the flag bits is proving more trouble than it's
worth.  Instead, use a pointer to an options struct like most similar
APIs do.

Callers with no special requests can pass NULL to request the default
options.

Cc: Bert Wesarg <bert.wesarg@googlemail.com>
Cc: Avery Pennarun <apenwarr@gmail.com>
Helped-by: Justin Frankel <justin@cockos.com>
Helped-by: Bert Wesarg <bert.wesarg@googlemail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/technical/api-merge.txt
builtin/checkout.c
ll-merge.c
ll-merge.h
merge-file.c
merge-recursive.c
rerere.c