Merge branch 'jc/merge-base' (early part)
authorJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 00:50:32 +0000 (16:50 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 14 Feb 2007 00:54:35 +0000 (16:54 -0800)
commit4a164d48df6bb1b4a771741c63d4437fd2dca0bb
tree73e3b0ca16e8ea83e9f761af476736c29b24caf9
parentf8f2aaa17297d6b21c84641edc2f6135575a003c
parent03840fc32d783be6750bf7e41a89687b8c3053eb
Merge branch 'jc/merge-base' (early part)

This contains an evil merge to fast-import, in order to
resolve in_merge_bases() update.
Makefile
builtin-branch.c
builtin-reflog.c
builtin.h
commit.c
commit.h
fast-import.c
git.c