Git:仅在一次提交中合并

Question

通常,我在Git中使用分支,但我不喜欢在我的工作树中看到数百个分支(Git历史).我想知道Git中是否有一个方法只在一次提交中"加入"一个分支中的所有提交(理想情况下是一个明确的提交消息).

像这样的东西:

git checkout -b branch
<some work>
git commit -a -m "commit 1"
<some work>
git commit -a -m "commit 2"
<some work>
git commit -a -m "commit 3"
git checkout master
git SUPER-JOIN branch -m "super commit"

在此之后,git日志中只存在"超级提交".

Answer 1

听起来你正在寻找以下--squash选项 git-merge:

git checkout master
git merge --squash branch -m "super commit"

Answer 2

这可以使用git rebase和压缩,或使用git merge --squash,请参阅

Git合并扁平化

和

git:squash/fixup之前的提交

Answer 3

如果你是肯定的,你只需要一次提交,并且没有被标记为"合并"的分支(可能是因为你将要删除它git branch -D my-squash-merged-branch并且永远不想再看到它),请使用:

git checkout master
git merge --squash branch-to-merge
git commit -m "message for commit"

但经过大量测试后,我认为合并大多数分支的最佳方法是:

git checkout master
git merge --no-ff branch-to-merge -m "message for commit"

这避免了"快进"合并,不允许-m "message"为许多合并指定选项.它实际上并不提供最初请求的单个提交,但至少可以很容易地看到分支的开始/结束,因此易于恢复等.A git log将显示合并的所有单个提交...

commit a6672a4c3d90c35d5f39c45f307ef6b385660196
Merge: 015f8d6 f84e029
Author: Brian White <bcwhite@example.com>
Date:   Wed Jan 15 20:47:35 2014 -0500

    merged something trivial

commit f84e02915faa02afc9a31b8c93a6e7712420687d
Author: Brian White <bcwhite@example.com>
Date:   Wed Jan 15 20:47:12 2014 -0500

    added something also trivial

commit 904d5b5ff00d691d63104a77d2e2ca484732a5fb
Author: Brian White <bcwhite@example.com>
Date:   Wed Jan 15 20:46:26 2014 -0500

    added something trivial

commit 015f8d681bdaf65725067ee8058215cedb529dd6
Author: Brian White <bcwhite@example.com>
Date:   Wed Jan 15 20:23:31 2014 -0500

    optimizations to MyThing
...

...但是如果你看一下log()的图形git log --graph,你可以看到git确实将它识别为单个合并.

*   commit a6672a4c3d90c35d5f39c45f307ef6b385660196
|\  Merge: 015f8d6 f84e029
| | Author: Brian White <bcwhite@example.com>
| | Date:   Wed Jan 15 20:47:35 2014 -0500
| |
| |     merged something trivial
| |
| * commit f84e02915faa02afc9a31b8c93a6e7712420687d
| | Author: Brian White <bcwhite@example.com>
| | Date:   Wed Jan 15 20:47:12 2014 -0500
| |
| |     added something also trivial
| |
| * commit 904d5b5ff00d691d63104a77d2e2ca484732a5fb
|/  Author: Brian White <bcwhite@example.com>
|   Date:   Wed Jan 15 20:46:26 2014 -0500
|
|       added something trivial
|
* commit 015f8d681bdaf65725067ee8058215cedb529dd6
| Author: Brian White <bcwhite@example.com>
| Date:   Wed Jan 15 20:23:31 2014 -0500
|
|     optimizations to MyThing
...

如果主分支上发生了提交或其他活动,则图形将显示从正确位置开始并在当前头部加入的合并分支,但当然所有提交仍将显示在日志中,其中来自分支的提交位于最佳.