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>

diff --cc builtin-branch.c
Simple merge

diff --cc builtin-fsck.c
Simple merge

diff --cc git-checkout.sh
index 1349e77f32157cc63fba6644ae2112c21ec5264e,99a81f509a081481c9ab96bd6d0d39a6afec93e1..2c8cbe43a6623305f9f98b4e3e8df05c3a5a268c
--- 1/git-checkout.sh
--- 2/git-checkout.sh
+++ b/git-checkout.sh
@@@ -250,7 -257,11 +257,11 @@@ if [ "$?" -eq 0 ]; the
        fi
        if test -n "$branch"
        then
 -              GIT_DIR="$GIT_DIR" git-symbolic-ref HEAD "refs/heads/$branch"
 +              GIT_DIR="$GIT_DIR" git-symbolic-ref -m "checkout: moving to $branch" HEAD "refs/heads/$branch"
+               if test -z "$quiet"
+               then
+                       echo >&2 "Switched to${newbranch:+ a new} branch \"$branch\""
+               fi
        elif test -n "$detached"
        then
                # NEEDSWORK: we would want a command to detach the HEAD

diff --cc refs.c
Simple merge