Code

Merge branch 'master' into next
authorJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 01:06:08 +0000 (18:06 -0700)
committerJunio C Hamano <junkio@cox.net>
Sat, 20 May 2006 01:06:08 +0000 (18:06 -0700)
commitae514b4c5b51e9b4ee1071898481c01b4d90f67b
tree6cdb3662510c7777d59760b13aef1daa6b7302a9
parentbf78d1a6cb65fe877a8d90b9d4ec95678621ff17
parent288c0384505e6c25cc1a162242919a0485d50a74
Merge branch 'master' into next

* master:
  Fix build procedure for builtin-init-db
  Allow pickaxe and diff-filter options to be used by git log.
  Libify the index refresh logic
  Builtin git-init-db
Makefile
builtin-log.c
builtin.h
cache.h
git.c
read-cache.c
update-index.c