Git merge: Difference between revisions
Jump to navigation
Jump to search
| Line 4: | Line 4: | ||
=Overview= | =Overview= | ||
git checkout <''base-branch''> | |||
git merge <''head-branch''> | |||
=Options= | =Options= | ||
Revision as of 16:32, 10 September 2019
Internal
Overview
git checkout <base-branch> git merge <head-branch>
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.