diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-11 02:05:12 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-11 02:05:12 -0700 |
| commit | 5d921e2931e5041884d8f86fdccc9004a7b071cc (patch) | |
| tree | deedbb6c40af5a3cceedf01ce0f315217a39fa16 /Makefile | |
| parent | 1c536069780bc67c05e621f0485f787d04559f24 (diff) | |
| parent | 8177631547e4d10ae071def07eff83e056092bfa (diff) | |
| download | git-5d921e2931e5041884d8f86fdccc9004a7b071cc.tar.gz | |
Merge branch 'jc/cherry-pick' (early part)
* 'jc/cherry-pick' (early part):
expose a helper function peel_to_type().
merge-recursive: split low-level merge functions out.
Conflicts:
Makefile
builtin-merge-recursive.c
sha1_name.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -308,7 +308,7 @@ LIB_H = \ run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h \ tree-walk.h log-tree.h dir.h path-list.h unpack-trees.h builtin.h \ utf8.h reflog-walk.h patch-ids.h attr.h decorate.h progress.h \ - mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h fsck.h \ + mailmap.h remote.h parse-options.h transport.h diffcore.h hash.h ll-merge.h fsck.h \ pack-revindex.h DIFF_OBJS = \ @@ -333,7 +333,7 @@ LIB_OBJS = \ color.o wt-status.o archive-zip.o archive-tar.o shallow.o utf8.o \ convert.o attr.o decorate.o progress.o mailmap.o symlinks.o remote.o \ transport.o bundle.o walker.o parse-options.o ws.o archive.o branch.o \ - alias.o fsck.o pack-revindex.o + ll-merge.o alias.o fsck.o pack-revindex.o BUILTIN_OBJS = \ builtin-add.o \ |