1GIT-MERGE(1) Git Manual GIT-MERGE(1)
2
6 git-merge - Join two or more development histories together
7
9 git merge [-n] [--stat] [--no-commit] [--squash] [--[no-]edit]
10 [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]]
11 [--[no-]allow-unrelated-histories]
12 [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] [<commit>...]
13 git merge (--continue | --abort | --quit)
14
16 Incorporates changes from the named commits (since the time their
17 histories diverged from the current branch) into the current branch.
18 This command is used by git pull to incorporate changes from another
19 repository and can be used by hand to merge changes from one branch
20 into another.
21 Assume the following history exists and the current branch is "master":
23 A---B---C topic
25 /
26 D---E---F---G master
27 Then "git merge topic" will replay the changes made on the topic branch
29 since it diverged from master (i.e., E) until its current commit (C) on
30 top of master, and record the result in a new commit along with the
31 names of the two parent commits and a log message from the user
32 describing the changes.
33 A---B---C topic
35 / \
36 D---E---F---G---H master
37 The second syntax ("git merge --abort") can only be run after the merge
39 has resulted in conflicts. git merge --abort will abort the merge
40 process and try to reconstruct the pre-merge state. However, if there
41 were uncommitted changes when the merge started (and especially if
42 those changes were further modified after the merge was started), git
43 merge --abort will in some cases be unable to reconstruct the original
44 (pre-merge) changes. Therefore:
45 Warning: Running git merge with non-trivial uncommitted changes is
47 discouraged: while possible, it may leave you in a state that is hard
48 to back out of in the case of a conflict.
49 The third syntax ("git merge --continue") can only be run after the
51 merge has resulted in conflicts.
52
54 --commit, --no-commit
55 Perform the merge and commit the result. This option can be used to
56 override --no-commit.
57 With --no-commit perform the merge and stop just before creating a
59 merge commit, to give the user a chance to inspect and further
60 tweak the merge result before committing.
61 Note that fast-forward updates do not create a merge commit and
63 therefore there is no way to stop those merges with --no-commit.
64 Thus, if you want to ensure your branch is not changed or updated
65 by the merge command, use --no-ff with --no-commit.
66 --edit, -e, --no-edit
68 Invoke an editor before committing successful mechanical merge to
69 further edit the auto-generated merge message, so that the user can
70 explain and justify the merge. The --no-edit option can be used to
71 accept the auto-generated message (this is generally discouraged).
72 The --edit (or -e) option is still useful if you are giving a draft
73 message with the -m option from the command line and want to edit
74 it in the editor.
75 Older scripts may depend on the historical behaviour of not
77 allowing the user to edit the merge log message. They will see an
78 editor opened when they run git merge. To make it easier to adjust
79 such scripts to the updated behaviour, the environment variable
80 GIT_MERGE_AUTOEDIT can be set to no at the beginning of them.
81 --cleanup=<mode>
83 This option determines how the merge message will be cleaned up
84 before committing. See git-commit(1) for more details. In addition,
85 if the <mode> is given a value of scissors, scissors will be
86 appended to MERGE_MSG before being passed on to the commit
87 machinery in the case of a merge conflict.
88 --ff, --no-ff, --ff-only
90 Specifies how a merge is handled when the merged-in history is
91 already a descendant of the current history. --ff is the default
92 unless merging an annotated (and possibly signed) tag that is not
93 stored in its natural place in the refs/tags/ hierarchy, in which
94 case --no-ff is assumed.
95 With --ff, when possible resolve the merge as a fast-forward (only
97 update the branch pointer to match the merged branch; do not create
98 a merge commit). When not possible (when the merged-in history is
99 not a descendant of the current history), create a merge commit.
100 With --no-ff, create a merge commit in all cases, even when the
102 merge could instead be resolved as a fast-forward.
103 With --ff-only, resolve the merge as a fast-forward when possible.
105 When not possible, refuse to merge and exit with a non-zero status.
106 -S[<keyid>], --gpg-sign[=<keyid>]
108 GPG-sign the resulting merge commit. The keyid argument is optional
109 and defaults to the committer identity; if specified, it must be
110 stuck to the option without a space.
111 --log[=<n>], --no-log
113 In addition to branch names, populate the log message with one-line
114 descriptions from at most <n> actual commits that are being merged.
115 See also git-fmt-merge-msg(1).
116 With --no-log do not list one-line descriptions from the actual
118 commits being merged.
119 --signoff, --no-signoff
121 Add Signed-off-by line by the committer at the end of the commit
122 log message. The meaning of a signoff depends on the project, but
123 it typically certifies that committer has the rights to submit this
124 work under the same license and agrees to a Developer Certificate
125 of Origin (see http://developercertificate.org/ for more
126 information).
127 With --no-signoff do not add a Signed-off-by line.
129 --stat, -n, --no-stat
131 Show a diffstat at the end of the merge. The diffstat is also
132 controlled by the configuration option merge.stat.
133 With -n or --no-stat do not show a diffstat at the end of the
135 merge.
136 --squash, --no-squash
138 Produce the working tree and index state as if a real merge
139 happened (except for the merge information), but do not actually
140 make a commit, move the HEAD, or record $GIT_DIR/MERGE_HEAD (to
141 cause the next git commit command to create a merge commit). This
142 allows you to create a single commit on top of the current branch
143 whose effect is the same as merging another branch (or more in case
144 of an octopus).
145 With --no-squash perform the merge and commit the result. This
147 option can be used to override --squash.
148 With --squash, --commit is not allowed, and will fail.
150 --no-verify
152 This option bypasses the pre-merge and commit-msg hooks. See also
153 githooks(5).
154 -s <strategy>, --strategy=<strategy>
156 Use the given merge strategy; can be supplied more than once to
157 specify them in the order they should be tried. If there is no -s
158 option, a built-in list of strategies is used instead (git
159 merge-recursive when merging a single head, git merge-octopus
160 otherwise).
161 -X <option>, --strategy-option=<option>
163 Pass merge strategy specific option through to the merge strategy.
164 --verify-signatures, --no-verify-signatures
166 Verify that the tip commit of the side branch being merged is
167 signed with a valid key, i.e. a key that has a valid uid: in the
168 default trust model, this means the signing key has been signed by
169 a trusted key. If the tip commit of the side branch is not signed
170 with a valid key, the merge is aborted.
171 --summary, --no-summary
173 Synonyms to --stat and --no-stat; these are deprecated and will be
174 removed in the future.
175 -q, --quiet
177 Operate quietly. Implies --no-progress.
178 -v, --verbose
180 Be verbose.
181 --progress, --no-progress
183 Turn progress on/off explicitly. If neither is specified, progress
184 is shown if standard error is connected to a terminal. Note that
185 not all merge strategies may support progress reporting.
186 --allow-unrelated-histories
188 By default, git merge command refuses to merge histories that do
189 not share a common ancestor. This option can be used to override
190 this safety when merging histories of two projects that started
191 their lives independently. As that is a very rare occasion, no
192 configuration variable to enable this by default exists and will
193 not be added.
194 -m <msg>
196 Set the commit message to be used for the merge commit (in case one
197 is created).
198 If --log is specified, a shortlog of the commits being merged will
200 be appended to the specified message.
201 The git fmt-merge-msg command can be used to give a good default
203 for automated git merge invocations. The automated message can
204 include the branch description.
205 -F <file>, --file=<file>
207 Read the commit message to be used for the merge commit (in case
208 one is created).
209 If --log is specified, a shortlog of the commits being merged will
211 be appended to the specified message.
212 --rerere-autoupdate, --no-rerere-autoupdate
214 Allow the rerere mechanism to update the index with the result of
215 auto-conflict resolution if possible.
216 --overwrite-ignore, --no-overwrite-ignore
218 Silently overwrite ignored files from the merge result. This is the
219 default behavior. Use --no-overwrite-ignore to abort.
220 --abort
222 Abort the current conflict resolution process, and try to
223 reconstruct the pre-merge state.
224 If there were uncommitted worktree changes present when the merge
226 started, git merge --abort will in some cases be unable to
227 reconstruct these changes. It is therefore recommended to always
228 commit or stash your changes before running git merge.
229 git merge --abort is equivalent to git reset --merge when
231 MERGE_HEAD is present.
232 --quit
234 Forget about the current merge in progress. Leave the index and the
235 working tree as-is.
236 --continue
238 After a git merge stops due to conflicts you can conclude the merge
239 by running git merge --continue (see "HOW TO RESOLVE CONFLICTS"
240 section below).
241 <commit>...
243 Commits, usually other branch heads, to merge into our branch.
244 Specifying more than one commit will create a merge with more than
245 two parents (affectionately called an Octopus merge).
246 If no commit is given from the command line, merge the
248 remote-tracking branches that the current branch is configured to
249 use as its upstream. See also the configuration section of this
250 manual page.
251 When FETCH_HEAD (and no other commit) is specified, the branches
253 recorded in the .git/FETCH_HEAD file by the previous invocation of
254 git fetch for merging are merged to the current branch.
255
257 Before applying outside changes, you should get your own work in good
258 shape and committed locally, so it will not be clobbered if there are
259 conflicts. See also git-stash(1). git pull and git merge will stop
260 without doing anything when local uncommitted changes overlap with
261 files that git pull/git merge may need to update.
262 To avoid recording unrelated changes in the merge commit, git pull and
264 git merge will also abort if there are any changes registered in the
265 index relative to the HEAD commit. (Special narrow exceptions to this
266 rule may exist depending on which merge strategy is in use, but
267 generally, the index must match HEAD.)
268 If all named commits are already ancestors of HEAD, git merge will exit
270 early with the message "Already up to date."
271
273 Often the current branch head is an ancestor of the named commit. This
274 is the most common case especially when invoked from git pull: you are
275 tracking an upstream repository, you have committed no local changes,
276 and now you want to update to a newer upstream revision. In this case,
277 a new commit is not needed to store the combined history; instead, the
278 HEAD (along with the index) is updated to point at the named commit,
279 without creating an extra merge commit.
280 This behavior can be suppressed with the --no-ff option.
282
284 Except in a fast-forward merge (see above), the branches to be merged
285 must be tied together by a merge commit that has both of them as its
286 parents.
287 A merged version reconciling the changes from all branches to be merged
289 is committed, and your HEAD, index, and working tree are updated to it.
290 It is possible to have modifications in the working tree as long as
291 they do not overlap; the update will preserve them.
292 When it is not obvious how to reconcile the changes, the following
294 happens:
295 1. The HEAD pointer stays the same.
297 2. The MERGE_HEAD ref is set to point to the other branch head.
299 3. Paths that merged cleanly are updated both in the index file and in
301 your working tree.
302 4. For conflicting paths, the index file records up to three versions:
304 stage 1 stores the version from the common ancestor, stage 2 from
305 HEAD, and stage 3 from MERGE_HEAD (you can inspect the stages with
306 git ls-files -u). The working tree files contain the result of the
307 "merge" program; i.e. 3-way merge results with familiar conflict
308 markers <<< === >>>.
309 5. No other changes are made. In particular, the local modifications
311 you had before you started merge will stay the same and the index
312 entries for them stay as they were, i.e. matching HEAD.
313 If you tried a merge which resulted in complex conflicts and want to
315 start over, you can recover with git merge --abort.
316
318 When merging an annotated (and possibly signed) tag, Git always creates
319 a merge commit even if a fast-forward merge is possible, and the commit
320 message template is prepared with the tag message. Additionally, if the
321 tag is signed, the signature check is reported as a comment in the
322 message template. See also git-tag(1).
323 When you want to just integrate with the work leading to the commit
325 that happens to be tagged, e.g. synchronizing with an upstream release
326 point, you may not want to make an unnecessary merge commit.
327 In such a case, you can "unwrap" the tag yourself before feeding it to
329 git merge, or pass --ff-only when you do not have any work on your own.
330 e.g.
331 git fetch origin
333 git merge v1.2.3^0
334 git merge --ff-only v1.2.3
335
337 During a merge, the working tree files are updated to reflect the
338 result of the merge. Among the changes made to the common ancestor’s
339 version, non-overlapping ones (that is, you changed an area of the file
340 while the other side left that area intact, or vice versa) are
341 incorporated in the final result verbatim. When both sides made changes
342 to the same area, however, Git cannot randomly pick one side over the
343 other, and asks you to resolve it by leaving what both sides did to
344 that area.
345 By default, Git uses the same style as the one used by the "merge"
347 program from the RCS suite to present such a conflicted hunk, like
348 this:
349 Here are lines that are either unchanged from the common
351 ancestor, or cleanly resolved because only one side changed.
352 <<<<<<< yours:sample.txt
353 Conflict resolution is hard;
354 let's go shopping.
355 =======
356 Git makes conflict resolution easy.
357 >>>>>>> theirs:sample.txt
358 And here is another line that is cleanly resolved or unmodified.
359 The area where a pair of conflicting changes happened is marked with
361 markers <<<<<<<, =======, and >>>>>>>. The part before the ======= is
362 typically your side, and the part afterwards is typically their side.
363 The default format does not show what the original said in the
365 conflicting area. You cannot tell how many lines are deleted and
366 replaced with Barbie’s remark on your side. The only thing you can tell
367 is that your side wants to say it is hard and you’d prefer to go
368 shopping, while the other side wants to claim it is easy.
369 An alternative style can be used by setting the "merge.conflictStyle"
371 configuration variable to "diff3". In "diff3" style, the above conflict
372 may look like this:
373 Here are lines that are either unchanged from the common
375 ancestor, or cleanly resolved because only one side changed.
376 <<<<<<< yours:sample.txt
377 Conflict resolution is hard;
378 let's go shopping.
379 |||||||
380 Conflict resolution is hard.
381 =======
382 Git makes conflict resolution easy.
383 >>>>>>> theirs:sample.txt
384 And here is another line that is cleanly resolved or unmodified.
385 In addition to the <<<<<<<, =======, and >>>>>>> markers, it uses
387 another ||||||| marker that is followed by the original text. You can
388 tell that the original just stated a fact, and your side simply gave in
389 to that statement and gave up, while the other side tried to have a
390 more positive attitude. You can sometimes come up with a better
391 resolution by viewing the original.
392
394 After seeing a conflict, you can do two things:
395 · Decide not to merge. The only clean-ups you need are to reset the
397 index file to the HEAD commit to reverse 2. and to clean up working
398 tree changes made by 2. and 3.; git merge --abort can be used for
399 this.
400 · Resolve the conflicts. Git will mark the conflicts in the working
402 tree. Edit the files into shape and git add them to the index. Use
403 git commit or git merge --continue to seal the deal. The latter
404 command checks whether there is a (interrupted) merge in progress
405 before calling git commit.
406 You can work through the conflict with a number of tools:
408 · Use a mergetool. git mergetool to launch a graphical mergetool
410 which will work you through the merge.
411 · Look at the diffs. git diff will show a three-way diff,
413 highlighting changes from both the HEAD and MERGE_HEAD versions.
414 · Look at the diffs from each branch. git log --merge -p <path> will
416 show diffs first for the HEAD version and then the MERGE_HEAD
417 version.
418 · Look at the originals. git show :1:filename shows the common
420 ancestor, git show :2:filename shows the HEAD version, and git show
421 :3:filename shows the MERGE_HEAD version.
422
424 · Merge branches fixes and enhancements on top of the current branch,
425 making an octopus merge:
426 $ git merge fixes enhancements
428 · Merge branch obsolete into the current branch, using ours merge
430 strategy:
431 $ git merge -s ours obsolete
433 · Merge branch maint into the current branch, but do not make a new
435 commit automatically:
436 $ git merge --no-commit maint
438 This can be used when you want to include further changes to the
440 merge, or want to write your own merge commit message.
441 You should refrain from abusing this option to sneak substantial
443 changes into a merge commit. Small fixups like bumping
444 release/version name would be acceptable.
445
447 The merge mechanism (git merge and git pull commands) allows the
448 backend merge strategies to be chosen with -s option. Some strategies
449 can also take their own options, which can be passed by giving
450 -X<option> arguments to git merge and/or git pull.
451 resolve
453 This can only resolve two heads (i.e. the current branch and
454 another branch you pulled from) using a 3-way merge algorithm. It
455 tries to carefully detect criss-cross merge ambiguities and is
456 considered generally safe and fast.
457 recursive
459 This can only resolve two heads using a 3-way merge algorithm. When
460 there is more than one common ancestor that can be used for 3-way
461 merge, it creates a merged tree of the common ancestors and uses
462 that as the reference tree for the 3-way merge. This has been
463 reported to result in fewer merge conflicts without causing
464 mismerges by tests done on actual merge commits taken from Linux
465 2.6 kernel development history. Additionally this can detect and
466 handle merges involving renames, but currently cannot make use of
467 detected copies. This is the default merge strategy when pulling or
468 merging one branch.
469 The recursive strategy can take the following options:
471 ours
473 This option forces conflicting hunks to be auto-resolved
474 cleanly by favoring our version. Changes from the other tree
475 that do not conflict with our side are reflected in the merge
476 result. For a binary file, the entire contents are taken from
477 our side.
478 This should not be confused with the ours merge strategy, which
480 does not even look at what the other tree contains at all. It
481 discards everything the other tree did, declaring our history
482 contains all that happened in it.
483 theirs
485 This is the opposite of ours; note that, unlike ours, there is
486 no theirs merge strategy to confuse this merge option with.
487 patience
489 With this option, merge-recursive spends a little extra time to
490 avoid mismerges that sometimes occur due to unimportant
491 matching lines (e.g., braces from distinct functions). Use this
492 when the branches to be merged have diverged wildly. See also
493 git-diff(1) --patience.
494 diff-algorithm=[patience|minimal|histogram|myers]
496 Tells merge-recursive to use a different diff algorithm, which
497 can help avoid mismerges that occur due to unimportant matching
498 lines (such as braces from distinct functions). See also git-
499 diff(1) --diff-algorithm.
500 ignore-space-change, ignore-all-space, ignore-space-at-eol,
502 ignore-cr-at-eol
503 Treats lines with the indicated type of whitespace change as
504 unchanged for the sake of a three-way merge. Whitespace changes
505 mixed with other changes to a line are not ignored. See also
506 git-diff(1) -b, -w, --ignore-space-at-eol, and
507 --ignore-cr-at-eol.
508 · If their version only introduces whitespace changes to a
510 line, our version is used;
511 · If our version introduces whitespace changes but their
513 version includes a substantial change, their version is
514 used;
515 · Otherwise, the merge proceeds in the usual way.
517 renormalize
519 This runs a virtual check-out and check-in of all three stages
520 of a file when resolving a three-way merge. This option is
521 meant to be used when merging branches with different clean
522 filters or end-of-line normalization rules. See "Merging
523 branches with differing checkin/checkout attributes" in
524 gitattributes(5) for details.
525 no-renormalize
527 Disables the renormalize option. This overrides the
528 merge.renormalize configuration variable.
529 no-renames
531 Turn off rename detection. This overrides the merge.renames
532 configuration variable. See also git-diff(1) --no-renames.
533 find-renames[=<n>]
535 Turn on rename detection, optionally setting the similarity
536 threshold. This is the default. This overrides the
537 merge.renames configuration variable. See also git-diff(1)
538 --find-renames.
539 rename-threshold=<n>
541 Deprecated synonym for find-renames=<n>.
542 subtree[=<path>]
544 This option is a more advanced form of subtree strategy, where
545 the strategy makes a guess on how two trees must be shifted to
546 match with each other when merging. Instead, the specified path
547 is prefixed (or stripped from the beginning) to make the shape
548 of two trees to match.
549 octopus
551 This resolves cases with more than two heads, but refuses to do a
552 complex merge that needs manual resolution. It is primarily meant
553 to be used for bundling topic branch heads together. This is the
554 default merge strategy when pulling or merging more than one
555 branch.
556 ours
558 This resolves any number of heads, but the resulting tree of the
559 merge is always that of the current branch head, effectively
560 ignoring all changes from all other branches. It is meant to be
561 used to supersede old development history of side branches. Note
562 that this is different from the -Xours option to the recursive
563 merge strategy.
564 subtree
566 This is a modified recursive strategy. When merging trees A and B,
567 if B corresponds to a subtree of A, B is first adjusted to match
568 the tree structure of A, instead of reading the trees at the same
569 level. This adjustment is also done to the common ancestor tree.
570 With the strategies that use 3-way merge (including the default,
572 recursive), if a change is made on both branches, but later reverted on
573 one of the branches, that change will be present in the merged result;
574 some people find this behavior confusing. It occurs because only the
575 heads and the merge base are considered when performing a merge, not
576 the individual commits. The merge algorithm therefore considers the
577 reverted change as no change at all, and substitutes the changed
578 version instead.
579
581 merge.conflictStyle
582 Specify the style in which conflicted hunks are written out to
583 working tree files upon merge. The default is "merge", which shows
584 a <<<<<<< conflict marker, changes made by one side, a =======
585 marker, changes made by the other side, and then a >>>>>>> marker.
586 An alternate style, "diff3", adds a ||||||| marker and the original
587 text before the ======= marker.
588 merge.defaultToUpstream
590 If merge is called without any commit argument, merge the upstream
591 branches configured for the current branch by using their last
592 observed values stored in their remote-tracking branches. The
593 values of the branch.<current branch>.merge that name the branches
594 at the remote named by branch.<current branch>.remote are
595 consulted, and then they are mapped via remote.<remote>.fetch to
596 their corresponding remote-tracking branches, and the tips of these
597 tracking branches are merged.
598 merge.ff
600 By default, Git does not create an extra merge commit when merging
601 a commit that is a descendant of the current commit. Instead, the
602 tip of the current branch is fast-forwarded. When set to false,
603 this variable tells Git to create an extra merge commit in such a
604 case (equivalent to giving the --no-ff option from the command
605 line). When set to only, only such fast-forward merges are allowed
606 (equivalent to giving the --ff-only option from the command line).
607 merge.verifySignatures
609 If true, this is equivalent to the --verify-signatures command line
610 option. See git-merge(1) for details.
611 merge.branchdesc
613 In addition to branch names, populate the log message with the
614 branch description text associated with them. Defaults to false.
615 merge.log
617 In addition to branch names, populate the log message with at most
618 the specified number of one-line descriptions from the actual
619 commits that are being merged. Defaults to false, and true is a
620 synonym for 20.
621 merge.renameLimit
623 The number of files to consider when performing rename detection
624 during a merge; if not specified, defaults to the value of
625 diff.renameLimit. This setting has no effect if rename detection is
626 turned off.
627 merge.renames
629 Whether Git detects renames. If set to "false", rename detection is
630 disabled. If set to "true", basic rename detection is enabled.
631 Defaults to the value of diff.renames.
632 merge.directoryRenames
634 Whether Git detects directory renames, affecting what happens at
635 merge time to new files added to a directory on one side of history
636 when that directory was renamed on the other side of history. If
637 merge.directoryRenames is set to "false", directory rename
638 detection is disabled, meaning that such new files will be left
639 behind in the old directory. If set to "true", directory rename
640 detection is enabled, meaning that such new files will be moved
641 into the new directory. If set to "conflict", a conflict will be
642 reported for such paths. If merge.renames is false,
643 merge.directoryRenames is ignored and treated as false. Defaults to
644 "conflict".
645 merge.renormalize
647 Tell Git that canonical representation of files in the repository
648 has changed over time (e.g. earlier commits record text files with
649 CRLF line endings, but recent ones use LF line endings). In such a
650 repository, Git can convert the data recorded in commits to a
651 canonical form before performing a merge to reduce unnecessary
652 conflicts. For more information, see section "Merging branches with
653 differing checkin/checkout attributes" in gitattributes(5).
654 merge.stat
656 Whether to print the diffstat between ORIG_HEAD and the merge
657 result at the end of the merge. True by default.
658 merge.tool
660 Controls which merge tool is used by git-mergetool(1). The list
661 below shows the valid built-in values. Any other value is treated
662 as a custom merge tool and requires that a corresponding
663 mergetool.<tool>.cmd variable is defined.
664 merge.guitool
666 Controls which merge tool is used by git-mergetool(1) when the
667 -g/--gui flag is specified. The list below shows the valid built-in
668 values. Any other value is treated as a custom merge tool and
669 requires that a corresponding mergetool.<guitool>.cmd variable is
670 defined.
671 · araxis
673 · bc
675 · bc3
677 · codecompare
679 · deltawalker
681 · diffmerge
683 · diffuse
685 · ecmerge
687 · emerge
689 · examdiff
691 · guiffy
693 · gvimdiff
695 · gvimdiff2
697 · gvimdiff3
699 · kdiff3
701 · meld
703 · opendiff
705 · p4merge
707 · smerge
709 · tkdiff
711 · tortoisemerge
713 · vimdiff
715 · vimdiff2
717 · vimdiff3
719 · winmerge
721 · xxdiff
723 merge.verbosity
725 Controls the amount of output shown by the recursive merge
726 strategy. Level 0 outputs nothing except a final error message if
727 conflicts were detected. Level 1 outputs only conflicts, 2 outputs
728 conflicts and file changes. Level 5 and above outputs debugging
729 information. The default is level 2. Can be overridden by the
730 GIT_MERGE_VERBOSITY environment variable.
731 merge.<driver>.name
733 Defines a human-readable name for a custom low-level merge driver.
734 See gitattributes(5) for details.
735 merge.<driver>.driver
737 Defines the command that implements a custom low-level merge
738 driver. See gitattributes(5) for details.
739 merge.<driver>.recursive
741 Names a low-level merge driver to be used when performing an
742 internal merge between common ancestors. See gitattributes(5) for
743 details.
744 branch.<name>.mergeOptions
746 Sets default options for merging into branch <name>. The syntax and
747 supported options are the same as those of git merge, but option
748 values containing whitespace characters are currently not
749 supported.
750
752 git-fmt-merge-msg(1), git-pull(1), gitattributes(5), git-reset(1), git-
753 diff(1), git-ls-files(1), git-add(1), git-rm(1), git-mergetool(1)
754
756 Part of the git(1) suite
757Git 2.26.2 2020-04-20 GIT-MERGE(1)