久违的想写个有点复杂的 Z-BlogPHP 插件，中间需要参考自己的其他项目，顺手改了下插件的一些格式排版，加了个新方法什么的，然而 git 提交时出错了- -

重点错误/状态信息：

(HEAD detached from xxxx)

You are not currently on a branch.

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
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可以看到具体的命令说明；

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
# 从当前 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 命令快捷输入_电脑网络_沉冰浮水：

https://www.wdssmq.com/post/20171130103.html