git: squash/fixup earlier commit

by

If you’re just looking for the easy solution for fixing up earlier commits, read the question! It explains it all. But since Elmarco was asking for a slick way, here we go:

As of Git 1.7.0, there is an --autosquash option for rebase, which does what you want. There is also the --fixup and --squash options for commit to make things easier. With some aliasing you can probably even get the whole thing into a single command.

I’d suggest upgrading to the newest Git for maximum awesomeness:

git/Documentation/RelNotes $ grep -i -A1 autosquash\\\|fixup *
1.7.0.txt: * "git rebase -i" learned new action "fixup" that squashes the change
1.7.0.txt-   but does not affect existing log message.
--
1.7.0.txt: * "git rebase -i" also learned --autosquash option that is useful
1.7.0.txt:   together with the new "fixup" action.
1.7.0.txt-
--
1.7.3.txt: * "git rebase -i" peeks into rebase.autosquash configuration and acts as
1.7.3.txt:   if you gave --autosquash from the command line.
1.7.3.txt-
--
1.7.4.txt: * "git commit" learned --fixup and --squash options to help later invocation
1.7.4.txt-   of the interactive rebase.
--
1.7.4.txt: * "git rebase --autosquash" can use SHA-1 object names to name which
1.7.4.txt:   commit to fix up (e.g. "fixup! e83c5163").
1.7.4.txt-

More Related Contents:

  1. Can “git pull” automatically stash and pop pending changes?
  2. Merge, update, and pull Git branches without using checkouts
  3. Where do the settings in my Git configuration come from?
  4. How to compare a local Git branch with its remote branch
  5. Change first commit of project with Git? [duplicate]
  6. What’s the equivalent of Subversion’s “use-commit-times” for Git?
  7. Warning: push.default is unset; its implicit value is changing in Git 2.0
  8. What exactly does the “u” do? “git push -u origin master” vs “git push origin master”
  9. Does github remember commit IDs?
  10. configure Git to accept a particular self-signed server certificate for a particular https remote
  11. How do I programmatically determine if there are uncommitted changes?
  12. How to inject a commit between some two arbitrary commits in the past?
  13. git difftool, open all diff files immediately, not in serial
  14. Git – remote: Repository not found
  15. Can I make a user-specific gitignore file?
  16. How to identify conflicting commits by hash during git rebase?
  17. How to git reset –hard a subdirectory
  18. Git-flow and master with multiple parallel release-branches
  19. error: Your local changes to the following files would be overwritten by checkout
  20. git push via cron
  21. What is the .git folder?
  22. Where does Git store the SHA1 of the commit for a submodule?
  23. GitHub – HTTPS access
  24. Git rebase branch with all parent branches (or dependent sub-branches)
  25. Push and pull my conda environment using git
  26. How do I fix “remote: fatal error in commit_refs” errors trying to push with Git?
  27. How can I rename a git stash?
  28. Where does Git store files?
  29. Git push error: RPC failed; result=56, HTTP code = 200 fatal: The remote end hung up unexpectedly fatal
  30. How to find last git commit before a merge

Leave a Comment