mirror of
https://github.com/git/git.git
synced 2024-11-19 02:43:58 +01:00
51e7ecf4ec
The diffstat can be controlled either with command-line options (--summary|--no-summary) or with merge.diffstat. The default is left as it was: diffstat is active by default. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
29 lines
1.1 KiB
Plaintext
29 lines
1.1 KiB
Plaintext
--summary::
|
|
Show a diffstat at the end of the merge. The diffstat is also
|
|
controlled by the configuration option merge.diffstat.
|
|
|
|
-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.
|
|
|
|
--squash::
|
|
Produce the working tree and index state as if a real
|
|
merge happened, but do not actually make a commit or
|
|
move the `HEAD`, nor record `$GIT_DIR/MERGE_HEAD` to
|
|
cause the next `git commit` command to create a merge
|
|
commit. This allows you to create a single commit on
|
|
top of the current branch whose effect is the same as
|
|
merging another branch (or more in case of an octopus).
|
|
|
|
-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).
|
|
|