Re: Problem with git push

[Bertrand Bordage]

The commit you want to push must follow origin/master.

If it does, just do:

git push --dry-run origin [hash_of_the_commit]:master

This will push this single commit.

If not, you have to rebase so that the commit follows origin/master:

git rebase -i origin

An editor opens, where you can change the order of the commits:

pick [small_hash1] [name1]

pick [small_hash2] [name2]

pick [small_hash2] [name2]

Rewrite this list so that the commit you want to push is on top.

Then git push origin [hash]:master

Bertrand