mirror of
https://github.com/git/git.git
synced 2024-10-07 02:11:19 +02:00
14 lines
433 B
Plaintext
14 lines
433 B
Plaintext
|
-n, --no-summary::
|
||
|
Do not show diffstat at the end of the merge.
|
||
|
|
||
|
--no-commit::
|
||
|
Perform the merge but pretend the merge failed and do
|
||
|
not autocommit.
|
||
|
|
||
|
-s <strategy>::
|
||
|
use that merge strategy; can be given more than once to
|
||
|
specify them in the order they should be tried. If
|
||
|
there is no `-s` option, built-in list of strategies is
|
||
|
used instead (`git-merge-resolve` when merging a single
|
||
|
head, `git-merge-octopus` otherwise).
|