Andrew's git / gitweb.git / diff
?
Merge branch 'sp/merge' (early part)
authorJunio C Hamano <junkio@cox.net>
Mon, 1 Jan 2007 22:40:37 +0000 (14:40 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 1 Jan 2007 22:40:37 +0000 (14:40 -0800)
* 'sp/merge' (early part):
Use merge-recursive in git-am -3.
Allow merging bare trees in merge-recursive.
Move better_branch_name above get_ref in merge-recursive.

Trivial merge