summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
blob: 56f1d8d69d05bb4aa26d0dad6e576332588090e8 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
--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).