git cherry-pick导致分支在origin / master之前

Question

我正在尝试将分支中的特定提交合并到master中，并将它们推送到origin。

以下是我正在做的事情：

M4600 ~/git/plutext/docx4j (master)
$ git reset --hard origin/master
HEAD is now at 2b2d124 Image support in non-XSLT HTML export.

M4600 ~/git/plutext/docx4j (master)
$ git status
# On branch master
nothing to commit (working directory clean)

M4600 ~/git/plutext/docx4j (master)
$ git cherry-pick d89cc32b11d338c0874838a730f04f83c85021bd
[master cb6bf93] Make table output work again.
 1 files changed, 11 insertions(+), 11 deletions(-)

M4600 ~/git/plutext/docx4j (master)
$ git status
# On branch master
# Your branch is ahead of 'origin/master' by 1 commit.
#
nothing to commit (working directory clean)

我哪里错了？

Answer 1

根本没有出错。

您只需将提交应用于本地主服务器，因此它现在只有1个以上的源/主服务器（远程分支），因此您只需要推送它。