How do you squash commits into one patch with git format-patch?

by

I’d recommend doing this on a throwaway branch as follows. If your commits are in the “newlines” branch and you have switched back to your “master” branch already, this should do the trick:

[adam@mbp2600 example (master)]$ git checkout -b tmpsquash
Switched to a new branch "tmpsquash"

[adam@mbp2600 example (tmpsquash)]$ git merge --squash newlines
Updating 4d2de39..b6768b2
Fast forward
Squash commit -- not updating HEAD
 test.txt |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

[adam@mbp2600 example (tmpsquash)]$ git commit -a -m "My squashed commits"
[tmpsquash]: created 75b0a89: "My squashed commits"
 1 files changed, 2 insertions(+), 0 deletions(-)

[adam@mbp2600 example (tmpsquash)]$ git format-patch master
0001-My-squashed-commits.patch

More Related Contents:

  1. Squash my last X commits together using Git
  2. How to squash my last x commits together?
  3. How do I squash my last N commits together?
  4. How can I merge multiple commits onto another branch as a single squashed commit?
  5. What is the difference between merge –squash and rebase?
  6. How to squash all git commits into one?
  7. How can I generate a Git patch for a specific commit?
  8. Combining multiple commits before pushing in Git [duplicate]
  9. How to squash commits in git after they have been pushed?
  10. How to move certain commits to be based on another branch in git?
  11. Squash the first two commits in Git? [duplicate]
  12. git: patch does not apply
  13. How to apply a patch generated with git format-patch?
  14. Can I split an already split hunk with git?
  15. How to apply a git patch from one repository to another?
  16. Git: How can I find a commit that most closely matches a directory?
  17. What is the difference between git am and git apply?
  18. How can I visualize per-character differences in a unified diff file?
  19. Is there a way to squash a number of commits non-interactively?
  20. Squash all my commits into one for GitHub pull request [duplicate]
  21. Git: How to create patches for a merge?
  22. How to apply `git diff` patch without Git installed?
  23. How to apply a Git patch to a file with a different name and path?
  24. What’s the purpose of git-mv?
  25. master branch and ‘origin/master’ have diverged, how to ‘undiverge’ branches’?
  26. Show git ahead and behind info for all branches, including remotes
  27. What to do with commit made in a detached head
  28. Git push error: “origin does not appear to be a git repository”
  29. Recover staged but not committed files after ‘git rm -rf’
  30. reset hard on git push

Leave a Comment