git.tremily.us Git - git.git/commit

author	Junio C Hamano <gitster@pobox.com>
	Thu, 26 Mar 2009 07:28:46 +0000 (00:28 -0700)
committer	Junio C Hamano <gitster@pobox.com>
	Thu, 26 Mar 2009 07:28:46 +0000 (00:28 -0700)
commit	f23336f5c15eb90df3275076181d10746479be5b
tree	e1be7917fda3ee83120b58faf2a862a42275193d	tree \| snapshot
parent	3fcee259d023087184c63eedf1015be6e23ea6e1	commit \| diff
parent	64fcef2daa03f6093b480142c6ab2a4173b0b43e	commit \| diff

Merge branch 'db/push-cleanup'

* db/push-cleanup:
Move push matching and reporting logic into transport.c
Use a common function to get the pretty name of refs

Conflicts:
transport.c

builtin-fetch.c	diff1 \|	diff2 \|	blob \| history
refs.c	diff1 \|	diff2 \|	blob \| history
transport.c	diff1 \|	diff2 \|	blob \| history

Git—the stupid content tracker

RSS Atom

builtin-fetch.c	diff1 \|	diff2 \|	blob \| history
refs.c	diff1 \|	diff2 \|	blob \| history
transport.c	diff1 \|	diff2 \|	blob \| history