1-n, \--no-summary:: 2 Do not show diffstat at the end of the merge. 3 4--no-commit:: 5 Perform the merge but pretend the merge failed and do 6 not autocommit, to give the user a chance to inspect and 7 further tweak the merge result before committing. 8 9--squash:: 10 Produce the working tree and index state as if a real 11 merge happened, but do not actually make a commit or 12 move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to 13 cause the next `git commit` command to create a merge 14 commit. This allows you to create a single commit on 15 top of the current branch whose effect is the same as 16 merging another branch (or more in case of an octopus). 17 18-s <strategy>, \--strategy=<strategy>:: 19 Use the given merge strategy; can be supplied more than 20 once to specify them in the order they should be tried. 21 If there is no `-s` option, a built-in list of strategies 22 is used instead (`git-merge-recursive` when merging a single 23 head, `git-merge-octopus` otherwise). 24