Created
April 15, 2013 08:53
-
-
Save mikina/5386817 to your computer and use it in GitHub Desktop.
Git - merge no ff The --no-ff flag causes the merge to always create a new commit object, even if the merge could be performed with a fast-forward.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| $ git checkout develop | |
| Switched to branch 'develop' | |
| $ git merge --no-ff myfeature | |
| Updating ea1b82a..05e9557 | |
| (Summary of changes) | |
| $ git branch -d myfeature | |
| Deleted branch myfeature (was 05e9557). | |
| $ git push origin develop |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment