Public Git Hosting - git/vmiklos.git/commit

summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 261fbda 9fa708d)

commit	684d0d8dcfa2288744a553fc7294c5f9f5c12026
author	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Nov 2009 22:44:22 +0000 (30 14:44 -0800)
committer	Junio C Hamano <gitster@pobox.com>
	Mon, 30 Nov 2009 22:44:22 +0000 (30 14:44 -0800)
tree	d790223199de25afa95aeb898d1b85d1e1dd3e1c	tree \| snapshot (tar.gz zip)
parent	261fbda903762b9c47e4138312673ea25555d9e5	commit \| diff
parent	9fa708dab1ccf8be69a606ca4eb58e62f3ef334a	commit \| diff

Merge branch 'jc/pretty-lf'

Conflicts:
pretty.c
t/t6006-rev-list-format.sh

Documentation/pretty-formats.txt	diff1 \|	diff2 \|	blob \| history
pretty.c	diff1 \|	diff2 \|	blob \| history
t/t6006-rev-list-format.sh	diff1 \|	diff2 \|	blob \| history

Miklos' Git tree to make git-merge a builtin.