How to change your commit messages in Git? — First published in fullweb.io issue #55

git-change-commit-messages.md

How to change your commit messages in Git?

At some point you’ll find yourself in a situation where you need edit a commit message. That commit might already be pushed or not, be the most recent or burried below 10 other commits, but fear not, git has your back 🙂.

Not pushed + most recent commit:

git commit --amend

This will open your $EDITOR and let you change the message. Continue with your usual git push origin master.

Already pushed + most recent commit:

git commit --amend
git push origin master --force

We edit the message like just above. But need to --force the push to update the remote history.

⚠️ But! Force pushing your commit after changing it will very likely prevent others to sync with the repo, if they already pulled a copy. You should first check with them.

Not pushed + old commit:

git rebase -i HEAD~X
# X is the number of commits to go back
# Move to the line of your commit, change pick into edit,
# then change your commit message:
git commit --amend
# Finish the rebase with:
git rebase --continue

Rebase opened your history and let you pick what to change. With edit you tell you want to change the message. Git moves you to a new branch to let you --amend the message. git rebase --continue puts you back in your previous branch with the message changed.

Already pushed + old commit:

Edit your message with the same 3 steps process as above (rebase -i, commit --amend, rebase --continue). Then force push the commit:

git push origin master --force

⚠️ But! Remember re-pushing your commit after changing it will very likely prevent others to sync with the repo, if they already pulled a copy. You should first check with them.

@nepsilon This works like a charm.

How to input you such emoji with text form?

I use your method to change those message I have pushed successfully. But seem git rebase --continue don't work anymore? If I run it, it will put me a information like:

No rebase in progress?

As the reminder, I think reword is more suitable for this target..

Thanks. It was helpful!

+1

Thanks! It's really helpful! 👍

Thanks for nice tip!

Very helpfull

Really helpful !!

What will others have to do to be able to sync with the repo if they have already pulled?

I have two commit and use the (git rebase -i HEAD~2) for change commit two, and why give me the commit head for change?!
in other word , if (n) commit i don't change the commit (n).

Thank it helpful

Thank you 👍

Great gist!
You can also use git push --force-with-lease when force pushing to the branch if you are worried about not overriding other's work.

Very good.. helpful. Thanks

thanks!

Trying to edit asd2 it give me an error.

commit asd1...
Author: ...
Date:   Sun Apr 7 11:47:46 2019 -0300

    3.32

commit asd2...
Author: ...
Date:   Sun Apr 7 10:52:53 2019 -0300

    X 3.31

git rebase -i HEAD~2
fatal: Needed a single revision
invalid upstream HEAD~2

---

Solution:
git rebase -i --root

👍

thanks really handy

Excellent. Thank you

👍 thanks

If you add the --preserve-merges option (or its synonym, -p) to the git rebase -i command, then git will try to preserve the merges when rebasing, rather than linearizing the history.

This one worked for me because on GitLab we use "Merge commit" as merge method in which "every merge creates a merge commit".

Thank you.

Already pushed + most recent commit:

git commit --amend
git push origin master --force-with-lease

Thanks! This is really helpful!

What if I want a commit using the hash?
is there any way to do that?

for example:

git commit -c [HASH] -m "new message"

just thinking though.

👍

Hello,
What if I want to change the commit message which I have committed through the GitHub website directly.

So basically I don't have the commits locally, I just changed the code in GitHub UI and opened a PR.

How can I change that commit message? Any ideas?

These changes seem to apply to the commit message 1st paragraph or title. What if I wanted to reword the 2nd paragraph?

Thanks!