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

author	Junio C Hamano <junkio@cox.net>
	Wed, 10 May 2006 02:32:08 +0000 (19:32 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Wed, 10 May 2006 02:32:08 +0000 (19:32 -0700)
commit	7278a29a277750e9e3cccce3cfb751d6171b1a43
tree	d15df79e0893f45c099867a513e3969d5f9659c9	tree \| snapshot
parent	dab809862f33799bd5838d93ac04d6c677231138	commit \| diff
parent	f7a3276bab880222e3117f8b8cbef40920dfe884	commit \| diff

Merge branch 'master' into next

* master:
  checkout: use --aggressive when running a 3-way merge (-m).
  revert/cherry-pick: use aggressive merge.
  read-cache.c: use xcalloc() not calloc()
  apply: fix infinite loop with multiple patches with --index

apply.c	diff1 \|	diff2 \|	blob \| history
read-cache.c	diff1 \|	diff2 \|	blob \| history

The core git plumbing

RSS Atom

apply.c	diff1 \|	diff2 \|	blob \| history
read-cache.c	diff1 \|	diff2 \|	blob \| history