0

I'm trying to merge specific commits from a branch into master, and push them to origin.

Here is what I'm doing:

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)

Where am I going wrong?

4

1 に答える 1

3

何も問題はありません。

ローカルマスターにコミットを適用しただけなので、origin / master（リモートブランチ）より1つ多いので、プッシュするだけです。

于 2012-05-19T02:13:27.097 に答える