aboutsummaryrefslogtreecommitdiff
path: root/git-merge-resolve.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-11 16:47:34 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-11 16:47:34 -0800
commitc388761c153bc3e874e75f69ff77430164c038c4 (patch)
treecaacf48f2cdb1878ec7f4fe03c957c6d482738b9 /git-merge-resolve.sh
parent4d229653ab5eda48f7b7c83cb2a876b48a41ffd4 (diff)
parentbfbbb8f8cf8250718ffd028efe179557d29ae72d (diff)
downloadgit-c388761c153bc3e874e75f69ff77430164c038c4.tar.gz
git-c388761c153bc3e874e75f69ff77430164c038c4.tar.xz
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 'git-merge-resolve.sh')
0 files changed, 0 insertions, 0 deletions