Git Merging


  • git merge another_branch [options]
  • git merge --abort


-mMessage to be included in the merge commit
-vShow verbose output
--abortAttempt to revert all files back to their state
--ff-onlyAborts instantly when a merge-commit would be required
--no-ffForces creation of a merge-commit, even if it wasn't mandatory
--no-commitPretends the merge failed to allow inspection and tweaking of the result
--statShow a diffstat after merge completion
-n/--no-statDon't show the diffstat
--squashAllows for a single commit on the current branch with the merged changes