你如何使用git format-patch将提交压缩成一个补丁？

Adam Alexand.. 181

我建议在一次性分支上执行此操作,如下所示.如果您的提交位于"newlines"分支中并且您已经切换回"master"分支,那么这应该可以解决问题:

[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

希望这可以帮助!

我建议在一次性分支上执行此操作,如下所示.如果您的提交位于"newlines"分支中并且您已经切换回"master"分支,那么这应该可以解决问题:

[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

希望这可以帮助!

只是为了添加一个解决方案:如果你使用它:

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

然后它仍然是8个补丁...但它们都将在一个补丁文件中并将作为一个应用:

git am < my_new_patch.diff

我总是在你的例子中使用git diff,比如

git diff master > patch.txt

如您所知,a git format-patch -8 HEAD将为您提供八个补丁.

如果您希望您的8个提交显示为一个,并且不介意重写您的分支(o-o-X-A-B-C-D-E-F-G-H)的历史记录,您可以:

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

或者,这将是一个更好的解决方案,重播所有8个提交X(在8次提交之前提交)在新分支上

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

这样,您只在"交付"分支上有一个提交,它代表您最近的8次提交

这是亚当亚历山大答案的改编,以防你的变化在主分支.这样做如下:

从我们想要的点创建一个新的一次性分支"tmpsquash"(查找运行"git --log"或使用gitg的SHA密钥.选择你想成为tmpsquash head的提交,在master之后的提交将是被压扁的提交).

合并从master到tmpsquash的更改.

将压扁的变化提交给tmpsquash.

使用压缩提交创建补丁.

回到主分公司

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)$