久違的想寫個有點複雜的 Z-BlogPHP 插件,中間需要參考自己的其他項目,順手改了下插件的一些格式排版,加了個新方法什麼的,然而 git 提交時出錯了 - -
重點錯誤 / 狀態信息:
(HEAD detached from xxxx)
You are not currently on a branch.
git pull
# You are not currently on a branch.
# Please specify which branch you want to merge with.
# See git-pull(1) for details.
# git pull <remote> <branch>
git bra
# * (HEAD detached from 3bff3f0)
# master
# remotes/origin/HEAD -> origin/master
# remotes/origin/master
git rev
# origin [email protected]:wdssmq/kumo-for-zblog.git (fetch)
# origin [email protected]:wdssmq/kumo-for-zblog.git (push)
注:
git bra
和git rev
,包括下邊的git sw
| git mnc
都是我自己定義的別名;
git branch -h
可以看到具體的命令說明;
# 從當前 HEAD 複製一個臨時分支
git br for-fix-2211
git bra
# * (HEAD detached from 3bff3f0)
# for-fix-2211
# master
# remotes/origin/HEAD -> origin/master
# remotes/origin/master
# 好像看不出啥,加個 -v 參數看看
git bra -v
# * (HEAD detached from 3bff3f0) ec3bf35 base. git 配置
# for-fix-2211 ec3bf35 base. git 配置
# master 3bff3f0 規則為空時的提示信息;
# remotes/origin/HEAD -> origin/master
# remotes/origin/master 3bff3f0 規則為空時的提示信息;
# 切換到 master 分支
git sw master
git bra -v
# for-fix-2211 ec3bf35 base. git 配置
# * master 3bff3f0 規則為空時的提示信息;
# remotes/origin/HEAD -> origin/master
# remotes/origin/master 3bff3f0 規則為空時的提示信息;
# 合併分支
git mnc for-fix-2211
git bra -v
# for-fix-2211 ec3bf35 base. git 配置
# * master ec3bf35 [ahead 3] base. git 配置
# remotes/origin/HEAD -> origin/master
# remotes/origin/master 3bff3f0 規則為空時的提示信息;
# 刪除臨時分支然後推送就可以了
git br -d for-fix-2211
git push
Git - git-branch Documentation:
https://git-scm.com/docs/git-branch/zh_HANS-CN#
「折騰」git 及 docker 命令快捷輸入_電腦網絡_沉冰浮水: