How to add a changed file to an older (not last) commit in Git

by

Use git rebase. Specifically:

  1. Use git stash to store the changes you want to add.
  2. Use git rebase -i HEAD~10 (or however many commits back you want to see).
  3. Mark the commit in question (a0865...) for edit by changing the word pick at the start of the line into edit. Don’t delete the other lines as that would delete the commits.[^vimnote]
  4. Save the rebase file, and git will drop back to the shell and wait for you to fix that commit.
  5. Pop the stash by using git stash pop.
  6. Add your file with git add <file>.
  7. Amend the commit with git commit --amend --no-edit.
  8. Do a git rebase --continue which will rewrite the rest of your commits against the new one.
  9. Repeat from step 2 onwards if you have marked more than one commit for edit.
  10. If you have previously pushed the modified commits anywhere else, then you will have to push --force again to update them on the remote. However, the usual warnings about using --force apply, and you can easily lose other people’s work if you are not careful and coordinate with them beforehand.

[^vimnote]: If you are using vim then you will have to hit the Insert key to edit, then Esc and type in :wq to save the file, quit the editor, and apply the changes. Alternatively, you can configure a user-friendly git commit editor with git config --global core.editor "nano".

More Related Contents:

  1. Why do I need to do `–set-upstream` all the time?
  2. Git push existing repo to a new and different remote repo server?
  3. How can I revert multiple Git commits?
  4. How do I work with a git repository within another repository?
  5. How do I recover/resynchronise after someone pushes a rebase or a reset to a published branch?
  6. How to iterate through all git branches using bash script
  7. Git conflict markers [duplicate]
  8. How to use git to get just the latest revision of a project?
  9. Message “Support for password authentication was removed. Please use a personal access token instead.”
  10. Push git commits & tags simultaneously
  11. Git branch command behaves like ‘less’
  12. Why is git submodule not updated automatically on git checkout?
  13. How to search through all Git and Mercurial commits in the repository for a certain string?
  14. Git Push into Production (FTP)
  15. How can I get the diff between all the commits that occurred between two dates with Git?
  16. Print commit message of a given commit in git
  17. Using GIT_SSH_COMMAND in Git for Windows
  18. Why would I want stage before committing in Git?
  19. How can I fork my own GitHub repository?
  20. In git, how do I sync my tags against a remote server?
  21. Git submodule is in “detached head” state after cloning and submodule update
  22. How do I reset or revert a file to a specific revision?
  23. How to complete a git clone for a big project on an unstable connection?
  24. Git http – securely remember credentials
  25. Differences between git pull origin master & git pull origin/master
  26. What is Git fast-forwarding?
  27. Gitolite git clone error
  28. Git: want to iterate through all commits on branch, and list files in each commit
  29. Restore git files deleted after git merge –abort
  30. Limiting file size in git repository

Leave a Comment