1
0
Fork 0
mirror of https://github.com/tldr-pages/tldr.git synced 2025-04-22 19:42:08 +02:00
tldr/pages/common/git-merge.md
Dillon Flamand 4bd7a1da17 git-merge: add --no-ff example
Include an example and brief description of the --no-ff option
2018-04-04 18:55:22 +05:30

15 lines
245 B
Markdown

# git merge
> Merge branches.
- Merge a branch with your current branch:
`git merge {{branch_name}}`
- Edit the merge message:
`git merge -e {{branch_name}}`
- Merge a branch and create a merge commit:
`git merge --no-ff {{branch_name}}`