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: http://git.tremily.us/?a=commitdiff_plain;h=d77ee72662a821d66ae218056f0103eb24d8d4b4;p=git.git

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

d77ee72662a821d66ae218056f0103eb24d8d4b4
diff --cc git-checkout.sh
index 1349e77f3,99a81f509..2c8cbe43a
--- a/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