git.verplant.org Git - git.git/commit

projects / git.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: bf78d1a 288c038)

author	Junio C Hamano <junkio@cox.net>
	Sat, 20 May 2006 01:06:08 +0000 (18:06 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Sat, 20 May 2006 01:06:08 +0000 (18:06 -0700)
commit	ae514b4c5b51e9b4ee1071898481c01b4d90f67b
tree	6cdb3662510c7777d59760b13aef1daa6b7302a9	tree \| snapshot
parent	bf78d1a6cb65fe877a8d90b9d4ec95678621ff17	commit \| diff
parent	288c0384505e6c25cc1a162242919a0485d50a74	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
builtin-log.c	diff1 \|	diff2 \|	blob \| history
builtin.h	diff1 \|	diff2 \|	blob \| history
cache.h	diff1 \|	diff2 \|	blob \| history
git.c	diff1 \|	diff2 \|	blob \| history
read-cache.c	diff1 \|	diff2 \|	blob \| history
update-index.c	diff1 \|	diff2 \|	blob \| history

The core git plumbing