Change old commit message using `git rebase`

by

It says:

When you save and exit the editor, it will rewind you back to that last commit in that list and drop you on the command line with the following message:

$ git rebase -i HEAD~3
Stopped at 7482e0d... updated the gemspec to hopefully work better
You can amend the commit now, with

It does not mean:

type again git rebase -i HEAD~3

Try to not typing git rebase -i HEAD~3 when exiting the editor, and it should work fine.
(otherwise, in your particular situation, a git rebase -i --abort might be needed to reset everything and allow you to try again)

As Dave Vogt mentions in the comments, git rebase --continue is for going to the next task in the rebasing process, after you’ve amended the first commit.

Also, Gregg Lind mentions in his answer the reword command of git rebase:

By replacing the command “pick” with the command “edit”, you can tell git rebase to stop after applying that commit, so that you can edit the files and/or the commit message, amend the commit, and continue rebasing.

If you just want to edit the commit message for a commit, replace the command “pick” with the command “reword“, since Git1.6.6 (January 2010).

It does the same thing ‘edit’ does during an interactive rebase, except it only lets you edit the commit message without returning control to the shell. This is extremely useful.
Currently if you want to clean up your commit messages you have to:

$ git rebase -i next

Then set all the commits to ‘edit’. Then on each one:

# Change the message in your editor.
$ git commit --amend
$ git rebase --continue

Using ‘reword’ instead of ‘edit’ lets you skip the git-commit and git-rebase calls.

More Related Contents:

  1. Undoing a git rebase
  2. What is the difference between merge –squash and rebase?
  3. How to squash all git commits into one?
  4. Insert a commit before the root commit in Git?
  5. What’s the difference between ‘git merge’ and ‘git rebase’?
  6. Combine the first two commits of a Git repository?
  7. Remove folder and its contents from git/GitHub’s history
  8. Rebasing a branch including all its children
  9. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  10. How to rebase many branches (with the same base commit) at once?
  11. Rebasing a Git merge commit
  12. Squash the first two commits in Git? [duplicate]
  13. How to rebase one Git repository onto another one?
  14. Git interactive rebase without opening the editor
  15. Git: How to rebase to a specific commit?
  16. Git rebase branch with all parent branches (or dependent sub-branches)
  17. Download a single folder or directory from a GitHub repo
  18. How to cherry-pick multiple commits
  19. How do I run git rebase –interactive in non-interactive manner?
  20. git rebase and git push: non-fast forward, why use?
  21. Split large Git repository into many smaller ones
  22. Can I arrange repositories into folders on Github?
  23. git rebase basics
  24. git pull –rebase lost commits after coworker’s git push –force
  25. How do I rename a repository on GitHub?
  26. Rebasing and what does one mean by rebasing pushed commits
  27. git push to remote repository “Could not read from remote repository”
  28. git subtree: possible to change subtree branch/path in a forked repository?
  29. Git rebase –preserve-merges fails
  30. When will `git pull –rebase` get me in to trouble?

Leave a Comment