You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
17 lines
561 B
17 lines
561 B
19 years ago
|
-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, to give the user a chance to inspect and
|
||
|
|
further tweak the merge result before committing.
|
||
|
|
|
||
|
|
|
||
|
|
-s <strategy>, \--strategy=<strategy>::
|
||
|
|
Use the given merge strategy; can be supplied more than
|
||
|
|
once to specify them in the order they should be tried.
|
||
|
|
If there is no `-s` option, a built-in list of strategies
|
||
|
|
is used instead (`git-merge-resolve` when merging a single
|
||
|
|
head, `git-merge-octopus` otherwise).
|
||
|
|
|