mirror of
https://github.com/git/git.git
synced 2024-12-01 05:54:16 +08:00
a6080a0a44
This uses "git-apply --whitespace=strip" to fix whitespace errors that have crept in to our source files over time. There are a few files that need to have trailing whitespaces (most notably, test vectors). The results still passes the test, and build result in Documentation/ area is unchanged. Signed-off-by: Junio C Hamano <gitster@pobox.com>
28 lines
1.1 KiB
Plaintext
28 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).
|