Merge branch 'jc/detached-head'
authorJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:47:34 +0000 (16:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Fri, 12 Jan 2007 00:47:34 +0000 (16:47 -0800)
* jc/detached-head:
git-checkout: handle local changes sanely when detaching HEAD
git-checkout: safety check for detached HEAD checks existing refs
git-checkout: fix branch name output from the command
git-checkout: safety when coming back from the detached HEAD state.
git-checkout: rewording comments regarding detached HEAD.
git-checkout: do not warn detaching HEAD when it is already detached.
Detached HEAD (experimental)
git-branch: show detached HEAD
git-status: show detached HEAD

1  2 
cache.h
path.c
wt-status.c
diff --cc cache.h
Simple merge
diff --cc path.c
Simple merge
diff --cc wt-status.c
Simple merge