Merge branch 'master' into np/dreflog
This is to resolve conflicts early in preparation for possible inclusion of "reflog on detached HEAD" series by Nico, as having it in 1.5.0 would really help us remove confusion between detached and attached states. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Feb 3, 2007 at 22:14 UTC
d77ee72662a821d66ae218056f0103eb24d8d4b4
No changes.