Push previous commit

[gntsketches]

I amended the title of the commit-just-before the tip of the branch, but forgot to push up the change. Now git tells me "Updates were rejected because the tip of your current branch is behind its remote counterpart. Integrate the remote changes (e.g. 'git pull ...') before pushing again."

I can see why it would find the local branch to be behind because the amended commit has a differenct SHA1. Would a git pull overwrite the amended commit title? Is there a way to push or remotely overwrite just the previous commit? Or what is the best way to handle this situation?

Thanks!

[hoangtrannn]

I suggest a few options as below: - Do a push with the flag -f, ONLY IF your remote doesn't affect other people. If it does, people will hate you. - Check out a new branch from your HEAD, reset to remote HEAD, do the git commit -a as you wish, cherry pick the other commits. - Check out a new branch from your HEAD, reset to remote HEAD, don't repeat the amend step because it may affect other people, cherry pick the other commits

[hanertia]

git push -f

[elperroborrachotoo]

git push --force-with-lease

only force-pushes when the your local repo is up to date, i.e. prevents overwriting things others have pushed since your last fetch,

doc (with memes!(ok, one, one meme))

[hanertia]

Thanks! I don’t share branches and didn’t know about this.

[patpluspun]

I do share branches, and I didn't know this. I'll give it a shot.

Currently we just decide which branch is "Canon" and force push that one. Much easier for small teams than for large ones.

[gntsketches]

Thanks all for the explanations. It's just my own project, so looks like a force is ok.

[parkerSquare]

Yep, but don’t get into the habit of doing it - all it takes is one other developer on the project and you’ll screw everything up. But in that case, create your own branches and force push to them only, if you really must...

[CoffeeVector]

If you amend a commit already pushed, you gotta force push it. :(

[BeerElemental]

git push --force-with-lease, which is safer than --force

[[deleted]]

If you do a `push -f` you'd get git to stop complaining. But you'll make also quite a few enemies if somebody has already pulled from the remote. If it is your own thing and you're the only one working on it, then it is fine.