“git merge”和”git merge–no ff”有什么区别？

What is the difference between `git merge` and `git merge --no-ff`?

使用gitk log，我无法发现两者之间的区别。我如何观察差异(使用git命令或某种工具)？

--no-fffrom the executing"git merge旗prevents快速前馈"if it is that your current HEADdetects安ancestor of the承诺你想合并。快速前馈is when，instead of建构在MERGE承诺，只是移动你的Git分支指针点at the incoming承诺。这commonly occurs when做没有任何地方在git pullchanges。P＞＜／

不管一个人多，你想occasionally防止from this行为发生，因为你想在maintain typically特异性分支拓扑(例如你得以在话题你想确保它分北路，当阅读历史)。以do that the --no-ff通行证，你可以在git merge旗帜将永远construct和MERGE instead of forwarding快餐。P＞＜／

如果你想similarly execute，或使用在git pullgit merge以快速前馈explicitly纾困，你想如果它不那么快了，你可以用the --ff-only旗。这样，你可以给我什么样的思维git pull --ff-only正则没有错误，然后如果它回来了，你可以去，如果你想和决定合并或垫底。P＞＜／

相关讨论

图形回答这问题

这里是网站与明确的解释》插图和图形git of using ff：MERGE -不行P＞＜／

difference between git merge --no-ff and git merge P＞＜／

直到我看到这，我完全失去了与Git。使用 -不- ff allows输入分支历史clearly see the reviewing to You checked超时工作。(that to github' S点"网络链接"工具来可视化和is another)与illustrations大参考。很好很好的一本参考complements with the first of a more with less焦点的那些acquainted Git。P＞＜／我newbs信息类Basic for

如果你是像我和我不是大师，我在这里回答Git Describes the，of files from删除处理git' deleting them from the s跟踪没有本地文件系统，但它似乎poorly documented经常共生。另一个情况是，让newb流队列，manages to which仍然回避我。P＞＜／工作流实例

在包装的最新网站，我和我去看我的back to My Notes工作流；EN useful to add an example思想这一答案。P＞＜／

我的工作流Git命令：ofP＞＜／

1
2
3
4
5
6
7
8

git checkout -b contact-form
(do your work on"contact-form")
git status
git commit -am "updated form in contact module"
git checkout master
git merge --no-ff contact-form
git branch -d contact-form
git push origin master

实际的使用，包括：explanations below。注：snipped Git below is the输出；是那么冗长。P＞＜／

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21

$ git status
# On branch master
# Changed but not updated:
# (use"git add/rm <file>..." to update what will be committed)
# (use"git checkout -- <file>..." to discard changes in working directory)
#
# modified: ecc/Desktop.php
# modified: ecc/Mobile.php
# deleted: ecc/ecc-config.php
# modified: ecc/readme.txt
# modified: ecc/test.php
# deleted: passthru-adapter.igs
# deleted: shop/mickey/index.php
#
# Untracked files:
# (use"git add <file>..." to include in what will be committed)
#
# ecc/upgrade.php
# ecc/webgility-config.php
# ecc/webgility-config.php.bak
# ecc/webgility-magento.php

3)注意：from above1)You can see the changes the输出等package' from the of the之外的升级，包括新的文件。there are also通知2)两个(not in the /ecc消去of this folder)独立变化。这些文件deletions instead of confusing eccwith different，11分，使cleanup那些文件是删除后的反思。3)不跟踪我的工作流。我的朋友想Git was about to get等工作了。P＞＜／

Rather below：做的比我的normally git commit -am"updated ecc package"包容性，只想在/eccadd the files folder。那些不是专门开发的文件部分消去t因为我已经git add，但他们是在tracked Git，need to remove them from this branch'承诺：SP＞＜／

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

$ git checkout -b ecc
$ git add ecc/*
$ git reset HEAD passthru-adapter.igs
$ git reset HEAD shop/mickey/index.php
Unstaged changes after reset:
M passthru-adapter.igs
M shop/mickey/index.php

$ git commit -m"Webgility ecc desktop connector files; integrates with Quickbooks"

$ git checkout master
D passthru-adapter.igs
D shop/mickey/index.php
Switched to branch 'master'
$ git merge --no-ff ecc
$ git branch -d ecc
Deleted branch ecc (was 98269a2).
$ git push origin master
Counting objects: 22, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (14/14), done.
Writing objects: 100% (14/14), 59.00 KiB, done.
Total 14 (delta 10), reused 0 (delta 0)
To [email protected]:me/mywebsite.git
8a0d9ec..333eff5 master -> master

P＞＜／脚本automating for the above

有10 + used this process时报have taken to a Day，写作to execute the scripts的批处理命令，几乎我自制的安真git_update.sh <"commit message">for the above做脚本的步骤。这里的for that is the GIST的开源脚本。P＞＜／

git commit -aminstead of files from the I AM"修饰"选择列表，然后pasting git status击走那些在这个脚本。这是因为肉类dozens of about…but edits自制多种组分名称the changes to help。P＞＜／

相关讨论

--no-ff选项确保不会发生快进合并，并且始终创建新的提交对象。如果您希望Git维护功能分支的历史记录，这是可取的。& git merge --no-ff vs git merge 在上图中，左侧是使用git merge --no-ff之后的git历史的一个例子，右侧是使用git merge的一个例子，在这里可以进行FF合并。