168

I've got eight commits on a branch that I'd like to email to some people who aren't git enlightened, yet. So far, everything I do either gives me 8 patch files, or starts giving me patch files for every commit in the branch's history, since the beginning of time. I used git rebase --interactive to squash the commits, but now everything I try gives me zillions of patches from the beginning of time. What am I doing wrong?

git format-patch master HEAD # yields zillions of patches, even though there's 
                             # only one commit since master
Dariusz Woźniak
  • 8,073
  • 5
  • 48
  • 67
skiphoppy
  • 83,104
  • 64
  • 169
  • 214

8 Answers8

192

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
Dharman
  • 21,838
  • 18
  • 57
  • 107
Adam Alexander
  • 14,992
  • 5
  • 39
  • 41
  • 2
    This is what I use when I want to keep the history locally (in case I need to edit the patch). Otherwise I just use rebase -i and squash the commits. – sebnow Mar 09 '09 at 05:23
  • 5
    for me, it worked more reliable with `git comit -m "My squashed commits"` otherwise it would add other untracked files – Sebastian Feb 26 '14 at 10:31
  • Additonally, you can switch to a specific commit instead of the master and do this to create a patch from commit to commit: `git checkout 775ec2a && git checkout -b patch && git merge --squash branchname` – Berry M. Nov 07 '17 at 11:36
135

Just to add one more solution to the pot: If you use this instead:

git format-patch master --stdout > my_new_patch.diff

Then it will still be 8 patches... but they'll all be in a single patchfile and will apply as one with:

git am < my_new_patch.diff
Taryn East
  • 26,180
  • 8
  • 82
  • 101
  • 13
    I like this solution. It is worth notice that it may create sometimes a lot bigger patch than method described by @Adam Alexander. This is because some files may be edited more than once through commits. This method treats each commit separately, even if some file was reverted. But most of the time this is not an issue. – gumik Jun 29 '12 at 09:17
  • 1
    This option is great if you're trying to avoid merging! (e.g. you want to skip some commits). You can still `git rebase -i ...` and squash them all down to one. – Jorge Orpinel May 27 '17 at 20:01
21

As you already know, a git format-patch -8 HEAD will give you eight patches.

If you want your 8 commits appear as one, and do not mind rewriting the history of your branch (o-o-X-A-B-C-D-E-F-G-H), you could :

git rebase -i
// squash A, B, C, D, E ,F, G into H

or, and it would be a better solution, replay all your 8 commits from X (the commit before your 8 commits) on a new branch

git branch delivery X
git checkout delivery
git merge --squash master
git format-patch HEAD

That way, you only have one commit on the "delivery" branch, and it represent all your last 8 commits

VonC
  • 1,042,979
  • 435
  • 3,649
  • 4,283
  • `git merge master` merely does a fast forward and doesn't squash commits into one. Change to `git merge --squash master` to get all commits squashed and visible in the staged area. Your flow will work with this change. (I'm using git version 2.1.0.) – Stunner Jan 13 '16 at 00:30
21

I always use git diff so in your example, something like

git diff master > patch.txt
Rob Di Marco
  • 37,996
  • 8
  • 64
  • 56
  • 15
    Except than you loose all commit messages and metadata. Beauty of git format-patch is that it is possible to reconstruct whole branch from a set of patches. – mcepl Aug 10 '11 at 14:07
  • the create-branch-and-squash method has the benefit of combining all the commit messages into one, but this method is much faster if you want to write your own commit message – woojoo666 Sep 03 '15 at 08:27
  • actually, a combined message can be done using `git log`, see [my answer](http://stackoverflow.com/a/32373193/1852456) for an example – woojoo666 Sep 03 '15 at 10:32
  • 2
    Nice option, but consider that 'git diff' cannot include binary differences (maybe there's an option to do it). – Santiago Villafuerte Feb 16 '16 at 13:37
18

This is an adaptation of Adam Alexander answer, in case your changes are in master branch. This do the following:

  • Creates a new throwaway branch "tmpsquash" from the point we want (look for the SHA key running "git --log" or with gitg. Select the commit you want to be tmpsquash head, the commits that are after that in master will be the squashed commits).
  • Merges the changes from master to tmpsquash.
  • Commits the squashed changes to tmpsquash.
  • Creates the patch with the squashed commits.
  • Goes back to master branch
laura@rune:~/example (master)$ git branch tmpsquash ba3c498878054e25afc5e22e207d62eb40ff1f38
laura@rune:~/example (master)$ git checkout tmpsquash
Switched to branch 'tmpsquash'
laura@rune:~/example (tmpsquash)$ git merge --squash master
Updating ba3c498..40386b8
Fast-forward
Squash commit -- not updating HEAD

[snip, changed files]

11 files changed, 212 insertions(+), 59 deletions(-)
laura@rune:~/example  (tmpsquash)$ git commit -a -m "My squashed commits"
[test2 6127e5c] My squashed commits
11 files changed, 212 insertions(+), 59 deletions(-)
laura@rune:~/example  (tmpsquash)$ git format-patch master
0001-My-squashed-commits.patch
laura@rune:~/example  (tmpsquash)$ git checkout master
Switched to branch 'master'
laura@rune:~/example  (master)$
rec
  • 2,011
  • 11
  • 31
  • 37
  • Making changes in master is an anti-pattern if you won't be pushing them to remote yourself. And if you will, you probably don't need to generate patch files for them. – ivan_pozdeev Apr 15 '16 at 13:55
7

Easiest way is to use git diff, and add in git log if you want the combined commit message that the squash method would output. For example, to create the patch between commit abcd and 1234:

git diff abcd..1234 > patch.diff
git log abcd..1234 > patchmsg.txt

Then when applying the patch:

git apply patch.diff
git add -A
git reset patch.diff patchmsg.txt
git commit -F patchmsg.txt

Don't forget the --binary argument to git diff when dealing with non-text files, e.g. images or videos.

woojoo666
  • 7,103
  • 6
  • 38
  • 51
6

Format-patch between two tags:

git checkout <source-tag>
git checkout -b <tmpsquash>
git merge --squash <target-tag>
git commit -a -m "<message>"
git format-patch <source-tag>
kashesandr
  • 1,360
  • 25
  • 31
0

Based on Adam Alexander's answer:

git checkout newlines
## must be rebased to master
git checkout -b temporary
# squash the commits
git rebase -i master
git format-patch master
Steven Penny
  • 82,115
  • 47
  • 308
  • 348
Julien W
  • 9
  • 1