mirror of
https://github.com/git/git.git
synced 2024-10-06 21:31:30 +02:00
d8ae1d10cd
Pasky and I did overlapping documentation independently; this is to pick up better wordings from what he sent me. Signed-off-by: Petr Baudis <pasky@suse.cz> Signed-off-by: Junio C Hamano <junkio@cox.net>
15 lines
525 B
Plaintext
15 lines
525 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>::
|
|
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).
|