summaryrefslogtreecommitdiffstats
path: root/t/t6022-merge-rename.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-12 01:47:34 +0100
committerJunio C Hamano <junkio@cox.net>2007-01-12 01:47:34 +0100
commitc388761c153bc3e874e75f69ff77430164c038c4 (patch)
treecaacf48f2cdb1878ec7f4fe03c957c6d482738b9 /t/t6022-merge-rename.sh
parentgit-status: wording update to deal with deleted files. (diff)
parentgit-checkout: handle local changes sanely when detaching HEAD (diff)
downloadgit-c388761c153bc3e874e75f69ff77430164c038c4.tar.xz
git-c388761c153bc3e874e75f69ff77430164c038c4.zip
Merge branch 'jc/detached-head'
* 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
Diffstat (limited to 't/t6022-merge-rename.sh')
0 files changed, 0 insertions, 0 deletions