Git Merging
Syntax
- git merge another_branch [options]
- git merge --abort
Parameters
| Parameter | Details |
|---|---|
-m | Message to be included in the merge commit |
-v | Show verbose output |
--abort | Attempt to revert all files back to their state |
--ff-only | Aborts instantly when a merge-commit would be required |
--no-ff | Forces creation of a merge-commit, even if it wasn't mandatory |
--no-commit | Pretends the merge failed to allow inspection and tweaking of the result |
--stat | Show a diffstat after merge completion |
-n/--no-stat | Don't show the diffstat |
--squash | Allows for a single commit on the current branch with the merged changes |
