Skip to content

Commit

Permalink
Merge branch 'jc/cherry-pick' (early part)
Browse files Browse the repository at this point in the history
* '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
  • Loading branch information
Junio C Hamano committed Mar 11, 2008
2 parents 1c53606 + 8177631 commit 5d921e2
Show file tree
Hide file tree
Showing 6 changed files with 449 additions and 389 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand All @@ -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 \
Expand Down
Loading

0 comments on commit 5d921e2

Please sign in to comment.