When modifying merge-recursive.h, for example builtin-merge-recursive.c have to be recompiled which was not true till now, causing various runtime errors using an incremental build. Signed-off-by: Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> --- On Wed, Sep 03, 2008 at 12:05:32AM +0200, Miklos Vajna <vmiklos@xxxxxxxxxxxxxx> wrote: > Subject: Re: [PATCH 1/2] merge-recursive: move call_depth to struct > merge_options While testing this one, I got some weird errors, finally they gone after a 'touch builtin-merge-recursive.c', I guess this is the right fix. Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index f697618..bec6a84 100644 --- a/Makefile +++ b/Makefile @@ -362,6 +362,7 @@ LIB_H += list-objects.h LIB_H += ll-merge.h LIB_H += log-tree.h LIB_H += mailmap.h +LIB_H += merge_recursive.h LIB_H += object.h LIB_H += pack.h LIB_H += pack-refs.h -- 1.6.0.1 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
