DawnMagnet/tldr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

git-merge: add --no-ff example

Browse Source 
Include an example and brief description of the --no-ff option
This commit is contained in:
Dillon Flamand
2018-04-02 16:59:41 -07:00
committed by Agniva De Sarker
parent 4aa6a324be
commit 4bd7a1da17
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pages/common/git-merge.md
View File

@@ -9,3 +9,7 @@
- Edit the merge message: - Edit the merge message:
`git merge -e {{branch_name}}` `git merge -e {{branch_name}}`
- Merge a branch and create a merge commit:
`git merge --no-ff {{branch_name}}`