git.oblomov.eu Git - git/commit

projects / git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3681d40 c82d711)

author	Junio C Hamano <junkio@cox.net>
	Sun, 14 Jan 2007 20:03:53 +0000 (12:03 -0800)
committer	Junio C Hamano <junkio@cox.net>
	Sun, 14 Jan 2007 20:03:53 +0000 (12:03 -0800)
commit	6de33478affbf252066cc5863add213ca5cdc13c
tree	59c31712816d4f75e3d86fcd742bf9b3bd1d0804	tree \| snapshot
parent	3681d40b965258f7559235642c75f2117476765e	commit \| diff
parent	c82d7117a1f499b43e21e0a4589a080edadaf706	commit \| diff

Merge branch 'sp/merge' (early part)

* 'sp/merge' (early part):
Improve merge performance by avoiding in-index merges.

Unnamed repository; edit this file 'description' to name the repository.