mirror of
https://github.com/git/git.git
synced 2024-11-18 22:04:14 +01:00
9688a882e1
We still said resolve was the default in handful places. Signed-off-by: Junio C Hamano <junkio@cox.net>
17 lines
563 B
Plaintext
17 lines
563 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, 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-recursive` when merging a single
|
|
head, `git-merge-octopus` otherwise).
|
|
|