From: Junio C Hamano <junkio@cox.net>
Date: Sun, 4 Feb 2007 06:14:40 +0000 (-0800)
Subject: Merge branch 'master' into np/dreflog
X-Git-Tag: v1.5.0-rc4~49^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d77ee72662a821d66ae218056f0103eb24d8d4b4?ds=inline;hp=d77ee72662a821d66ae218056f0103eb24d8d4b4

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>
---