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