Re: [PATCH v3 11/23] ll-merge.c: remove implicit dependency on the_index

2018-09-11 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > --- > apply.c| 9 ++--- > builtin/checkout.c | 3 ++- > diff.c | 2 +- > ll-merge.c | 17 + > ll-merge.h | 5 - > merge-blobs.c | 3 ++- > merge-recursive.c | 3 ++- > notes-merge.c

[PATCH v3 11/23] ll-merge.c: remove implicit dependency on the_index

2018-09-09 Thread Nguyễn Thái Ngọc Duy
--- apply.c| 9 ++--- builtin/checkout.c | 3 ++- diff.c | 2 +- ll-merge.c | 17 + ll-merge.h | 5 - merge-blobs.c | 3 ++- merge-recursive.c | 3 ++- notes-merge.c | 3 ++- rerere.c | 10 ++ 9