Git merge: Difference between revisions
Jump to navigation
Jump to search
| Line 9: | Line 9: | ||
==--no-ff== | ==--no-ff== | ||
Create a merge commit [[Git_Concepts#Forcing_No_Fast-Forward|even when the merge resolves as a fast-forward]]. This is the default behaviour when merging an annotated tag. | Create a merge commit [[Git_Concepts#Forcing_No_Fast-Forward|even when the merge resolves as a fast-forward]]. This is the default behaviour when merging an annotated tag. This is also the default behavior when merging GitHub pull requests with "[[GitHub Procedures#Create_a_Merge_Commit|Create a merge commit]]" option. | ||
Revision as of 21:21, 7 August 2019
Internal
Overview
Options
--no-ff
Create a merge commit even when the merge resolves as a fast-forward. This is the default behaviour when merging an annotated tag. This is also the default behavior when merging GitHub pull requests with "Create a merge commit" option.