| blob | 5199a19457f39a6c24930ac494043aa84303a26e |
1 '\" t
2 .\" Title: git-merge
3 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
4 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
5 .\" Date: 2024-02-19
6 .\" Manual: Git Manual
7 .\" Source: Git 2.44.0.rc2
8 .\" Language: English
9 .\"
10 .TH "GIT\-MERGE" "1" "2024\-02\-19" "Git 2\&.44\&.0\&.rc2" "Git Manual"
11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff
13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq '
20 .\" -----------------------------------------------------------------
21 .\" * set default formatting
22 .\" -----------------------------------------------------------------
23 .\" disable hyphenation
24 .nh
25 .\" disable justification (adjust text to left margin only)
26 .ad l
27 .\" -----------------------------------------------------------------
28 .\" * MAIN CONTENT STARTS HERE *
29 .\" -----------------------------------------------------------------
30 .SH "NAME"
31 git-merge \- Join two or more development histories together
32 .SH "SYNOPSIS"
33 .sp
34 .nf
35 \fIgit merge\fR [\-n] [\-\-stat] [\-\-no\-commit] [\-\-squash] [\-\-[no\-]edit]
36 [\-\-no\-verify] [\-s <strategy>] [\-X <strategy\-option>] [\-S[<keyid>]]
37 [\-\-[no\-]allow\-unrelated\-histories]
38 [\-\-[no\-]rerere\-autoupdate] [\-m <msg>] [\-F <file>]
39 [\-\-into\-name <branch>] [<commit>\&...]
40 \fIgit merge\fR (\-\-continue | \-\-abort | \-\-quit)
41 .fi
42 .sp
43 .SH "DESCRIPTION"
44 .sp
45 Incorporates changes from the named commits (since the time their histories diverged from the current branch) into the current branch\&. This command is used by \fBgit pull\fR to incorporate changes from another repository and can be used by hand to merge changes from one branch into another\&.
46 .sp
47 Assume the following history exists and the current branch is \fBmaster\fR:
48 .sp
49 .if n \{\
50 .RS 4
51 .\}
52 .nf
53 A\-\-\-B\-\-\-C topic
54 /
55 D\-\-\-E\-\-\-F\-\-\-G master
56 .fi
57 .if n \{\
58 .RE
59 .\}
60 .sp
61 .sp
62 Then \fBgit merge topic\fR will replay the changes made on the \fBtopic\fR branch since it diverged from \fBmaster\fR (i\&.e\&., \fBE\fR) until its current commit (\fBC\fR) on top of \fBmaster\fR, and record the result in a new commit along with the names of the two parent commits and a log message from the user describing the changes\&. Before the operation, \fBORIG_HEAD\fR is set to the tip of the current branch (\fBC\fR)\&.
63 .sp
64 .if n \{\
65 .RS 4
66 .\}
67 .nf
68 A\-\-\-B\-\-\-C topic
69 / \e
70 D\-\-\-E\-\-\-F\-\-\-G\-\-\-H master
71 .fi
72 .if n \{\
73 .RE
74 .\}
75 .sp
76 .sp
77 A merge stops if there\(cqs a conflict that cannot be resolved automatically or if \fB\-\-no\-commit\fR was provided when initiating the merge\&. At that point you can run \fBgit merge \-\-abort\fR or \fBgit merge \-\-continue\fR\&.
78 .sp
79 \fBgit merge \-\-abort\fR will abort the merge process and try to reconstruct the pre\-merge state\&. However, if there were uncommitted changes when the merge started (and especially if those changes were further modified after the merge was started), \fBgit merge \-\-abort\fR will in some cases be unable to reconstruct the original (pre\-merge) changes\&. Therefore:
80 .sp
81 \fBWarning\fR: Running \fBgit merge\fR with non\-trivial uncommitted changes is discouraged: while possible, it may leave you in a state that is hard to back out of in the case of a conflict\&.
82 .SH "OPTIONS"
83 .PP
84 \-\-commit, \-\-no\-commit
85 .RS 4
86 Perform the merge and commit the result\&. This option can be used to override \-\-no\-commit\&.
87 .sp
88 With \-\-no\-commit perform the merge and stop just before creating a merge commit, to give the user a chance to inspect and further tweak the merge result before committing\&.
89 .sp
90 Note that fast\-forward updates do not create a merge commit and therefore there is no way to stop those merges with \-\-no\-commit\&. Thus, if you want to ensure your branch is not changed or updated by the merge command, use \-\-no\-ff with \-\-no\-commit\&.
91 .RE
92 .PP
93 \-\-edit, \-e, \-\-no\-edit
94 .RS 4
95 Invoke an editor before committing successful mechanical merge to further edit the auto\-generated merge message, so that the user can explain and justify the merge\&. The
96 \fB\-\-no\-edit\fR
97 option can be used to accept the auto\-generated message (this is generally discouraged)\&. The
98 \fB\-\-edit\fR
99 (or
100 \fB\-e\fR) option is still useful if you are giving a draft message with the
101 \fB\-m\fR
102 option from the command line and want to edit it in the editor\&.
103 .sp
104 Older scripts may depend on the historical behaviour of not allowing the user to edit the merge log message\&. They will see an editor opened when they run
105 \fBgit merge\fR\&. To make it easier to adjust such scripts to the updated behaviour, the environment variable
106 \fBGIT_MERGE_AUTOEDIT\fR
107 can be set to
108 \fBno\fR
109 at the beginning of them\&.
110 .RE
111 .PP
112 \-\-cleanup=<mode>
113 .RS 4
114 This option determines how the merge message will be cleaned up before committing\&. See
115 \fBgit-commit\fR(1)
116 for more details\&. In addition, if the
117 \fI<mode>\fR
118 is given a value of
119 \fBscissors\fR, scissors will be appended to
120 \fBMERGE_MSG\fR
121 before being passed on to the commit machinery in the case of a merge conflict\&.
122 .RE
123 .PP
124 \-\-ff, \-\-no\-ff, \-\-ff\-only
125 .RS 4
126 Specifies how a merge is handled when the merged\-in history is already a descendant of the current history\&.
127 \fB\-\-ff\fR
128 is the default unless merging an annotated (and possibly signed) tag that is not stored in its natural place in the
129 \fBrefs/tags/\fR
130 hierarchy, in which case
131 \fB\-\-no\-ff\fR
132 is assumed\&.
133 .sp
134 With
135 \fB\-\-ff\fR, when possible resolve the merge as a fast\-forward (only update the branch pointer to match the merged branch; do not create a merge commit)\&. When not possible (when the merged\-in history is not a descendant of the current history), create a merge commit\&.
136 .sp
137 With
138 \fB\-\-no\-ff\fR, create a merge commit in all cases, even when the merge could instead be resolved as a fast\-forward\&.
139 .sp
140 With
141 \fB\-\-ff\-only\fR, resolve the merge as a fast\-forward when possible\&. When not possible, refuse to merge and exit with a non\-zero status\&.
142 .RE
143 .PP
144 \-S[<keyid>], \-\-gpg\-sign[=<keyid>], \-\-no\-gpg\-sign
145 .RS 4
146 GPG\-sign the resulting merge commit\&. The
147 \fBkeyid\fR
148 argument is optional and defaults to the committer identity; if specified, it must be stuck to the option without a space\&.
149 \fB\-\-no\-gpg\-sign\fR
150 is useful to countermand both
151 \fBcommit\&.gpgSign\fR
152 configuration variable, and earlier
153 \fB\-\-gpg\-sign\fR\&.
154 .RE
155 .PP
156 \-\-log[=<n>], \-\-no\-log
157 .RS 4
158 In addition to branch names, populate the log message with one\-line descriptions from at most <n> actual commits that are being merged\&. See also
159 \fBgit-fmt-merge-msg\fR(1)\&.
160 .sp
161 With \-\-no\-log do not list one\-line descriptions from the actual commits being merged\&.
162 .RE
163 .PP
164 \-\-signoff, \-\-no\-signoff
165 .RS 4
166 Add a
167 \fBSigned\-off\-by\fR
168 trailer by the committer at the end of the commit log message\&. The meaning of a signoff depends on the project to which you\(cqre committing\&. For example, it may certify that the committer has the rights to submit the work under the project\(cqs license or agrees to some contributor representation, such as a Developer Certificate of Origin\&. (See
169 \m[blue]\fBhttps://developercertificate\&.org\fR\m[]
170 for the one used by the Linux kernel and Git projects\&.) Consult the documentation or leadership of the project to which you\(cqre contributing to understand how the signoffs are used in that project\&.
171 .sp
172 The \-\-no\-signoff option can be used to countermand an earlier \-\-signoff option on the command line\&.
173 .RE
174 .PP
175 \-\-stat, \-n, \-\-no\-stat
176 .RS 4
177 Show a diffstat at the end of the merge\&. The diffstat is also controlled by the configuration option merge\&.stat\&.
178 .sp
179 With \-n or \-\-no\-stat do not show a diffstat at the end of the merge\&.
180 .RE
181 .PP
182 \-\-squash, \-\-no\-squash
183 .RS 4
184 Produce the working tree and index state as if a real merge happened (except for the merge information), but do not actually make a commit, move the
185 \fBHEAD\fR, or record
186 \fB$GIT_DIR/MERGE_HEAD\fR
187 (to cause the next
188 \fBgit commit\fR
189 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)\&.
190 .sp
191 With \-\-no\-squash perform the merge and commit the result\&. This option can be used to override \-\-squash\&.
192 .sp
193 With \-\-squash, \-\-commit is not allowed, and will fail\&.
194 .RE
195 .PP
196 \-\-[no\-]verify
197 .RS 4
198 By default, the pre\-merge and commit\-msg hooks are run\&. When
199 \fB\-\-no\-verify\fR
200 is given, these are bypassed\&. See also
201 \fBgithooks\fR(5)\&.
202 .RE
203 .PP
204 \-s <strategy>, \-\-strategy=<strategy>
205 .RS 4
206 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
207 \fB\-s\fR
208 option, a built\-in list of strategies is used instead (\fBort\fR
209 when merging a single head,
210 \fBoctopus\fR
211 otherwise)\&.
212 .RE
213 .PP
214 \-X <option>, \-\-strategy\-option=<option>
215 .RS 4
216 Pass merge strategy specific option through to the merge strategy\&.
217 .RE
218 .PP
219 \-\-verify\-signatures, \-\-no\-verify\-signatures
220 .RS 4
221 Verify that the tip commit of the side branch being merged is signed with a valid key, i\&.e\&. a key that has a valid uid: in the default trust model, this means the signing key has been signed by a trusted key\&. If the tip commit of the side branch is not signed with a valid key, the merge is aborted\&.
222 .RE
223 .PP
224 \-\-summary, \-\-no\-summary
225 .RS 4
226 Synonyms to \-\-stat and \-\-no\-stat; these are deprecated and will be removed in the future\&.
227 .RE
228 .PP
229 \-q, \-\-quiet
230 .RS 4
231 Operate quietly\&. Implies \-\-no\-progress\&.
232 .RE
233 .PP
234 \-v, \-\-verbose
235 .RS 4
236 Be verbose\&.
237 .RE
238 .PP
239 \-\-progress, \-\-no\-progress
240 .RS 4
241 Turn progress on/off explicitly\&. If neither is specified, progress is shown if standard error is connected to a terminal\&. Note that not all merge strategies may support progress reporting\&.
242 .RE
243 .PP
244 \-\-autostash, \-\-no\-autostash
245 .RS 4
246 Automatically create a temporary stash entry before the operation begins, record it in the ref
247 \fBMERGE_AUTOSTASH\fR
248 and apply it after the operation ends\&. This means that you can run the operation on a dirty worktree\&. However, use with care: the final stash application after a successful merge might result in non\-trivial conflicts\&.
249 .RE
250 .PP
251 \-\-allow\-unrelated\-histories
252 .RS 4
253 By default,
254 \fBgit merge\fR
255 command refuses to merge histories that do not share a common ancestor\&. This option can be used to override this safety when merging histories of two projects that started their lives independently\&. As that is a very rare occasion, no configuration variable to enable this by default exists and will not be added\&.
256 .RE
257 .PP
258 \-m <msg>
259 .RS 4
260 Set the commit message to be used for the merge commit (in case one is created)\&.
261 .sp
262 If
263 \fB\-\-log\fR
264 is specified, a shortlog of the commits being merged will be appended to the specified message\&.
265 .sp
266 The
267 \fBgit fmt\-merge\-msg\fR
268 command can be used to give a good default for automated
269 \fBgit merge\fR
270 invocations\&. The automated message can include the branch description\&.
271 .RE
272 .PP
273 \-\-into\-name <branch>
274 .RS 4
275 Prepare the default merge message as if merging to the branch
276 \fB<branch>\fR, instead of the name of the real branch to which the merge is made\&.
277 .RE
278 .PP
279 \-F <file>, \-\-file=<file>
280 .RS 4
281 Read the commit message to be used for the merge commit (in case one is created)\&.
282 .sp
283 If
284 \fB\-\-log\fR
285 is specified, a shortlog of the commits being merged will be appended to the specified message\&.
286 .RE
287 .PP
288 \-\-rerere\-autoupdate, \-\-no\-rerere\-autoupdate
289 .RS 4
290 After the rerere mechanism reuses a recorded resolution on the current conflict to update the files in the working tree, allow it to also update the index with the result of resolution\&.
291 \fB\-\-no\-rerere\-autoupdate\fR
292 is a good way to double\-check what
293 \fBrerere\fR
294 did and catch potential mismerges, before committing the result to the index with a separate
295 \fBgit add\fR\&.
296 .RE
297 .PP
298 \-\-overwrite\-ignore, \-\-no\-overwrite\-ignore
299 .RS 4
300 Silently overwrite ignored files from the merge result\&. This is the default behavior\&. Use
301 \fB\-\-no\-overwrite\-ignore\fR
302 to abort\&.
303 .RE
304 .PP
305 \-\-abort
306 .RS 4
307 Abort the current conflict resolution process, and try to reconstruct the pre\-merge state\&. If an autostash entry is present, apply it to the worktree\&.
308 .sp
309 If there were uncommitted worktree changes present when the merge started,
310 \fBgit merge \-\-abort\fR
311 will in some cases be unable to reconstruct these changes\&. It is therefore recommended to always commit or stash your changes before running
312 \fBgit merge\fR\&.
313 .sp
314 \fBgit merge \-\-abort\fR
315 is equivalent to
316 \fBgit reset \-\-merge\fR
317 when
318 \fBMERGE_HEAD\fR
319 is present unless
320 \fBMERGE_AUTOSTASH\fR
321 is also present in which case
322 \fBgit merge \-\-abort\fR
323 applies the stash entry to the worktree whereas
324 \fBgit reset \-\-merge\fR
325 will save the stashed changes in the stash list\&.
326 .RE
327 .PP
328 \-\-quit
329 .RS 4
330 Forget about the current merge in progress\&. Leave the index and the working tree as\-is\&. If
331 \fBMERGE_AUTOSTASH\fR
332 is present, the stash entry will be saved to the stash list\&.
333 .RE
334 .PP
335 \-\-continue
336 .RS 4
337 After a
338 \fBgit merge\fR
339 stops due to conflicts you can conclude the merge by running
340 \fBgit merge \-\-continue\fR
341 (see "HOW TO RESOLVE CONFLICTS" section below)\&.
342 .RE
343 .PP
344 <commit>\&...
345 .RS 4
346 Commits, usually other branch heads, to merge into our branch\&. Specifying more than one commit will create a merge with more than two parents (affectionately called an Octopus merge)\&.
347 .sp
348 If no commit is given from the command line, merge the remote\-tracking branches that the current branch is configured to use as its upstream\&. See also the configuration section of this manual page\&.
349 .sp
350 When
351 \fBFETCH_HEAD\fR
352 (and no other commit) is specified, the branches recorded in the
353 \fB\&.git/FETCH_HEAD\fR
354 file by the previous invocation of
355 \fBgit fetch\fR
356 for merging are merged to the current branch\&.
357 .RE
358 .SH "PRE\-MERGE CHECKS"
359 .sp
360 Before applying outside changes, you should get your own work in good shape and committed locally, so it will not be clobbered if there are conflicts\&. See also \fBgit-stash\fR(1)\&. \fBgit pull\fR and \fBgit merge\fR will stop without doing anything when local uncommitted changes overlap with files that \fBgit pull\fR/\fBgit merge\fR may need to update\&.
361 .sp
362 To avoid recording unrelated changes in the merge commit, \fBgit pull\fR and \fBgit merge\fR will also abort if there are any changes registered in the index relative to the \fBHEAD\fR commit\&. (Special narrow exceptions to this rule may exist depending on which merge strategy is in use, but generally, the index must match HEAD\&.)
363 .sp
364 If all named commits are already ancestors of \fBHEAD\fR, \fBgit merge\fR will exit early with the message "Already up to date\&."
365 .SH "FAST\-FORWARD MERGE"
366 .sp
367 Often the current branch head is an ancestor of the named commit\&. This is the most common case especially when invoked from \fBgit pull\fR: you are tracking an upstream repository, you have committed no local changes, and now you want to update to a newer upstream revision\&. In this case, a new commit is not needed to store the combined history; instead, the \fBHEAD\fR (along with the index) is updated to point at the named commit, without creating an extra merge commit\&.
368 .sp
369 This behavior can be suppressed with the \fB\-\-no\-ff\fR option\&.
370 .SH "TRUE MERGE"
371 .sp
372 Except in a fast\-forward merge (see above), the branches to be merged must be tied together by a merge commit that has both of them as its parents\&.
373 .sp
374 A merged version reconciling the changes from all branches to be merged is committed, and your \fBHEAD\fR, index, and working tree are updated to it\&. It is possible to have modifications in the working tree as long as they do not overlap; the update will preserve them\&.
375 .sp
376 When it is not obvious how to reconcile the changes, the following happens:
377 .sp
378 .RS 4
379 .ie n \{\
380 \h'-04' 1.\h'+01'\c
381 .\}
382 .el \{\
383 .sp -1
384 .IP " 1." 4.2
385 .\}
386 The
387 \fBHEAD\fR
388 pointer stays the same\&.
389 .RE
390 .sp
391 .RS 4
392 .ie n \{\
393 \h'-04' 2.\h'+01'\c
394 .\}
395 .el \{\
396 .sp -1
397 .IP " 2." 4.2
398 .\}
399 The
400 \fBMERGE_HEAD\fR
401 ref is set to point to the other branch head\&.
402 .RE
403 .sp
404 .RS 4
405 .ie n \{\
406 \h'-04' 3.\h'+01'\c
407 .\}
408 .el \{\
409 .sp -1
410 .IP " 3." 4.2
411 .\}
412 Paths that merged cleanly are updated both in the index file and in your working tree\&.
413 .RE
414 .sp
415 .RS 4
416 .ie n \{\
417 \h'-04' 4.\h'+01'\c
418 .\}
419 .el \{\
420 .sp -1
421 .IP " 4." 4.2
422 .\}
423 For conflicting paths, the index file records up to three versions: stage 1 stores the version from the common ancestor, stage 2 from
424 \fBHEAD\fR, and stage 3 from
425 \fBMERGE_HEAD\fR
426 (you can inspect the stages with
427 \fBgit ls\-files \-u\fR)\&. The working tree files contain the result of the merge operation; i\&.e\&. 3\-way merge results with familiar conflict markers
428 \fB<<<\fR
429 \fB===\fR
430 \fB>>>\fR\&.
431 .RE
432 .sp
433 .RS 4
434 .ie n \{\
435 \h'-04' 5.\h'+01'\c
436 .\}
437 .el \{\
438 .sp -1
439 .IP " 5." 4.2
440 .\}
441 A ref named
442 \fBAUTO_MERGE\fR
443 is written, pointing to a tree corresponding to the current content of the working tree (including conflict markers for textual conflicts)\&. Note that this ref is only written when the
444 \fIort\fR
445 merge strategy is used (the default)\&.
446 .RE
447 .sp
448 .RS 4
449 .ie n \{\
450 \h'-04' 6.\h'+01'\c
451 .\}
452 .el \{\
453 .sp -1
454 .IP " 6." 4.2
455 .\}
456 No other changes are made\&. In particular, the local modifications you had before you started merge will stay the same and the index entries for them stay as they were, i\&.e\&. matching
457 \fBHEAD\fR\&.
458 .RE
459 .sp
460 If you tried a merge which resulted in complex conflicts and want to start over, you can recover with \fBgit merge \-\-abort\fR\&.
461 .SH "MERGING TAG"
462 .sp
463 When merging an annotated (and possibly signed) tag, Git always creates a merge commit even if a fast\-forward merge is possible, and the commit message template is prepared with the tag message\&. Additionally, if the tag is signed, the signature check is reported as a comment in the message template\&. See also \fBgit-tag\fR(1)\&.
464 .sp
465 When you want to just integrate with the work leading to the commit that happens to be tagged, e\&.g\&. synchronizing with an upstream release point, you may not want to make an unnecessary merge commit\&.
466 .sp
467 In such a case, you can "unwrap" the tag yourself before feeding it to \fBgit merge\fR, or pass \fB\-\-ff\-only\fR when you do not have any work on your own\&. e\&.g\&.
468 .sp
469 .if n \{\
470 .RS 4
471 .\}
472 .nf
473 git fetch origin
474 git merge v1\&.2\&.3^0
475 git merge \-\-ff\-only v1\&.2\&.3
476 .fi
477 .if n \{\
478 .RE
479 .\}
480 .sp
481 .SH "HOW CONFLICTS ARE PRESENTED"
482 .sp
483 During a merge, the working tree files are updated to reflect the result of the merge\&. Among the changes made to the common ancestor\(cqs version, non\-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim\&. When both sides made changes to the same area, however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area\&.
484 .sp
485 By default, Git uses the same style as the one used by the "merge" program from the RCS suite to present such a conflicted hunk, like this:
486 .sp
487 .if n \{\
488 .RS 4
489 .\}
490 .nf
491 Here are lines that are either unchanged from the common
492 ancestor, or cleanly resolved because only one side changed,
493 or cleanly resolved because both sides changed the same way\&.
494 <<<<<<< yours:sample\&.txt
495 Conflict resolution is hard;
496 let\*(Aqs go shopping\&.
497 =======
498 Git makes conflict resolution easy\&.
499 >>>>>>> theirs:sample\&.txt
500 And here is another line that is cleanly resolved or unmodified\&.
501 .fi
502 .if n \{\
503 .RE
504 .\}
505 .sp
506 .sp
507 The area where a pair of conflicting changes happened is marked with markers \fB<<<<<<<\fR, \fB=======\fR, and \fB>>>>>>>\fR\&. The part before the \fB=======\fR is typically your side, and the part afterwards is typically their side\&.
508 .sp
509 The default format does not show what the original said in the conflicting area\&. You cannot tell how many lines are deleted and replaced with Barbie\(cqs remark on your side\&. The only thing you can tell is that your side wants to say it is hard and you\(cqd prefer to go shopping, while the other side wants to claim it is easy\&.
510 .sp
511 An alternative style can be used by setting the \fBmerge\&.conflictStyle\fR configuration variable to either "diff3" or "zdiff3"\&. In "diff3" style, the above conflict may look like this:
512 .sp
513 .if n \{\
514 .RS 4
515 .\}
516 .nf
517 Here are lines that are either unchanged from the common
518 ancestor, or cleanly resolved because only one side changed,
519 <<<<<<< yours:sample\&.txt
520 or cleanly resolved because both sides changed the same way\&.
521 Conflict resolution is hard;
522 let\*(Aqs go shopping\&.
523 ||||||| base:sample\&.txt
524 or cleanly resolved because both sides changed identically\&.
525 Conflict resolution is hard\&.
526 =======
527 or cleanly resolved because both sides changed the same way\&.
528 Git makes conflict resolution easy\&.
529 >>>>>>> theirs:sample\&.txt
530 And here is another line that is cleanly resolved or unmodified\&.
531 .fi
532 .if n \{\
533 .RE
534 .\}
535 .sp
536 .sp
537 while in "zdiff3" style, it may look like this:
538 .sp
539 .if n \{\
540 .RS 4
541 .\}
542 .nf
543 Here are lines that are either unchanged from the common
544 ancestor, or cleanly resolved because only one side changed,
545 or cleanly resolved because both sides changed the same way\&.
546 <<<<<<< yours:sample\&.txt
547 Conflict resolution is hard;
548 let\*(Aqs go shopping\&.
549 ||||||| base:sample\&.txt
550 or cleanly resolved because both sides changed identically\&.
551 Conflict resolution is hard\&.
552 =======
553 Git makes conflict resolution easy\&.
554 >>>>>>> theirs:sample\&.txt
555 And here is another line that is cleanly resolved or unmodified\&.
556 .fi
557 .if n \{\
558 .RE
559 .\}
560 .sp
561 .sp
562 In addition to the \fB<<<<<<<\fR, \fB=======\fR, and \fB>>>>>>>\fR markers, it uses another \fB|||||||\fR marker that is followed by the original text\&. You can tell that the original just stated a fact, and your side simply gave in to that statement and gave up, while the other side tried to have a more positive attitude\&. You can sometimes come up with a better resolution by viewing the original\&.
563 .SH "HOW TO RESOLVE CONFLICTS"
564 .sp
565 After seeing a conflict, you can do two things:
566 .sp
567 .RS 4
568 .ie n \{\
569 \h'-04'\(bu\h'+03'\c
570 .\}
571 .el \{\
572 .sp -1
573 .IP \(bu 2.3
574 .\}
575 Decide not to merge\&. The only clean\-ups you need are to reset the index file to the
576 \fBHEAD\fR
577 commit to reverse 2\&. and to clean up working tree changes made by 2\&. and 3\&.;
578 \fBgit merge \-\-abort\fR
579 can be used for this\&.
580 .RE
581 .sp
582 .RS 4
583 .ie n \{\
584 \h'-04'\(bu\h'+03'\c
585 .\}
586 .el \{\
587 .sp -1
588 .IP \(bu 2.3
589 .\}
590 Resolve the conflicts\&. Git will mark the conflicts in the working tree\&. Edit the files into shape and
591 \fBgit add\fR
592 them to the index\&. Use
593 \fBgit commit\fR
594 or
595 \fBgit merge \-\-continue\fR
596 to seal the deal\&. The latter command checks whether there is a (interrupted) merge in progress before calling
597 \fBgit commit\fR\&.
598 .RE
599 .sp
600 You can work through the conflict with a number of tools:
601 .sp
602 .RS 4
603 .ie n \{\
604 \h'-04'\(bu\h'+03'\c
605 .\}
606 .el \{\
607 .sp -1
608 .IP \(bu 2.3
609 .\}
610 Use a mergetool\&.
611 \fBgit mergetool\fR
612 to launch a graphical mergetool which will work through the merge with you\&.
613 .RE
614 .sp
615 .RS 4
616 .ie n \{\
617 \h'-04'\(bu\h'+03'\c
618 .\}
619 .el \{\
620 .sp -1
621 .IP \(bu 2.3
622 .\}
623 Look at the diffs\&.
624 \fBgit diff\fR
625 will show a three\-way diff, highlighting changes from both the
626 \fBHEAD\fR
627 and
628 \fBMERGE_HEAD\fR
629 versions\&.
630 \fBgit diff AUTO_MERGE\fR
631 will show what changes you\(cqve made so far to resolve textual conflicts\&.
632 .RE
633 .sp
634 .RS 4
635 .ie n \{\
636 \h'-04'\(bu\h'+03'\c
637 .\}
638 .el \{\
639 .sp -1
640 .IP \(bu 2.3
641 .\}
642 Look at the diffs from each branch\&.
643 \fBgit log \-\-merge \-p <path>\fR
644 will show diffs first for the
645 \fBHEAD\fR
646 version and then the
647 \fBMERGE_HEAD\fR
648 version\&.
649 .RE
650 .sp
651 .RS 4
652 .ie n \{\
653 \h'-04'\(bu\h'+03'\c
654 .\}
655 .el \{\
656 .sp -1
657 .IP \(bu 2.3
658 .\}
659 Look at the originals\&.
660 \fBgit show :1:filename\fR
661 shows the common ancestor,
662 \fBgit show :2:filename\fR
663 shows the
664 \fBHEAD\fR
665 version, and
666 \fBgit show :3:filename\fR
667 shows the
668 \fBMERGE_HEAD\fR
669 version\&.
670 .RE
671 .SH "EXAMPLES"
672 .sp
673 .RS 4
674 .ie n \{\
675 \h'-04'\(bu\h'+03'\c
676 .\}
677 .el \{\
678 .sp -1
679 .IP \(bu 2.3
680 .\}
681 Merge branches
682 \fBfixes\fR
683 and
684 \fBenhancements\fR
685 on top of the current branch, making an octopus merge:
686 .sp
687 .if n \{\
688 .RS 4
689 .\}
690 .nf
691 $ git merge fixes enhancements
692 .fi
693 .if n \{\
694 .RE
695 .\}
696 .sp
697 .RE
698 .sp
699 .RS 4
700 .ie n \{\
701 \h'-04'\(bu\h'+03'\c
702 .\}
703 .el \{\
704 .sp -1
705 .IP \(bu 2.3
706 .\}
707 Merge branch
708 \fBobsolete\fR
709 into the current branch, using
710 \fBours\fR
711 merge strategy:
712 .sp
713 .if n \{\
714 .RS 4
715 .\}
716 .nf
717 $ git merge \-s ours obsolete
718 .fi
719 .if n \{\
720 .RE
721 .\}
722 .sp
723 .RE
724 .sp
725 .RS 4
726 .ie n \{\
727 \h'-04'\(bu\h'+03'\c
728 .\}
729 .el \{\
730 .sp -1
731 .IP \(bu 2.3
732 .\}
733 Merge branch
734 \fBmaint\fR
735 into the current branch, but do not make a new commit automatically:
736 .sp
737 .if n \{\
738 .RS 4
739 .\}
740 .nf
741 $ git merge \-\-no\-commit maint
742 .fi
743 .if n \{\
744 .RE
745 .\}
746 .sp
747 This can be used when you want to include further changes to the merge, or want to write your own merge commit message\&.
748 .sp
749 You should refrain from abusing this option to sneak substantial changes into a merge commit\&. Small fixups like bumping release/version name would be acceptable\&.
750 .RE
751 .SH "MERGE STRATEGIES"
752 .sp
753 The merge mechanism (\fBgit merge\fR and \fBgit pull\fR commands) allows the backend \fImerge strategies\fR to be chosen with \fB\-s\fR option\&. Some strategies can also take their own options, which can be passed by giving \fB\-X<option>\fR arguments to \fBgit merge\fR and/or \fBgit pull\fR\&.
754 .PP
755 ort
756 .RS 4
757 This is the default merge strategy when pulling or merging one branch\&. This strategy can only resolve two heads using a 3\-way merge algorithm\&. When there is more than one common ancestor that can be used for 3\-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3\-way merge\&. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2\&.6 kernel development history\&. Additionally this strategy can detect and handle merges involving renames\&. It does not make use of detected copies\&. The name for this algorithm is an acronym ("Ostensibly Recursive\(cqs Twin") and came from the fact that it was written as a replacement for the previous default algorithm,
758 \fBrecursive\fR\&.
759 .sp
760 The
761 \fIort\fR
762 strategy can take the following options:
763 .PP
764 ours
765 .RS 4
766 This option forces conflicting hunks to be auto\-resolved cleanly by favoring
767 \fIour\fR
768 version\&. Changes from the other tree that do not conflict with our side are reflected in the merge result\&. For a binary file, the entire contents are taken from our side\&.
769 .sp
770 This should not be confused with the
771 \fIours\fR
772 merge strategy, which does not even look at what the other tree contains at all\&. It discards everything the other tree did, declaring
773 \fIour\fR
774 history contains all that happened in it\&.
775 .RE
776 .PP
777 theirs
778 .RS 4
779 This is the opposite of
780 \fIours\fR; note that, unlike
781 \fIours\fR, there is no
782 \fItheirs\fR
783 merge strategy to confuse this merge option with\&.
784 .RE
785 .PP
786 ignore\-space\-change, ignore\-all\-space, ignore\-space\-at\-eol, ignore\-cr\-at\-eol
787 .RS 4
788 Treats lines with the indicated type of whitespace change as unchanged for the sake of a three\-way merge\&. Whitespace changes mixed with other changes to a line are not ignored\&. See also
789 \fBgit-diff\fR(1)
790 \fB\-b\fR,
791 \fB\-w\fR,
792 \fB\-\-ignore\-space\-at\-eol\fR, and
793 \fB\-\-ignore\-cr\-at\-eol\fR\&.
794 .sp
795 .RS 4
796 .ie n \{\
797 \h'-04'\(bu\h'+03'\c
798 .\}
799 .el \{\
800 .sp -1
801 .IP \(bu 2.3
802 .\}
803 If
804 \fItheir\fR
805 version only introduces whitespace changes to a line,
806 \fIour\fR
807 version is used;
808 .RE
809 .sp
810 .RS 4
811 .ie n \{\
812 \h'-04'\(bu\h'+03'\c
813 .\}
814 .el \{\
815 .sp -1
816 .IP \(bu 2.3
817 .\}
818 If
819 \fIour\fR
820 version introduces whitespace changes but
821 \fItheir\fR
822 version includes a substantial change,
823 \fItheir\fR
824 version is used;
825 .RE
826 .sp
827 .RS 4
828 .ie n \{\
829 \h'-04'\(bu\h'+03'\c
830 .\}
831 .el \{\
832 .sp -1
833 .IP \(bu 2.3
834 .\}
835 Otherwise, the merge proceeds in the usual way\&.
836 .RE
837 .RE
838 .PP
839 renormalize
840 .RS 4
841 This runs a virtual check\-out and check\-in of all three stages of a file when resolving a three\-way merge\&. This option is meant to be used when merging branches with different clean filters or end\-of\-line normalization rules\&. See "Merging branches with differing checkin/checkout attributes" in
842 \fBgitattributes\fR(5)
843 for details\&.
844 .RE
845 .PP
846 no\-renormalize
847 .RS 4
848 Disables the
849 \fBrenormalize\fR
850 option\&. This overrides the
851 \fBmerge\&.renormalize\fR
852 configuration variable\&.
853 .RE
854 .PP
855 find\-renames[=<n>]
856 .RS 4
857 Turn on rename detection, optionally setting the similarity threshold\&. This is the default\&. This overrides the
858 \fImerge\&.renames\fR
859 configuration variable\&. See also
860 \fBgit-diff\fR(1)
861 \fB\-\-find\-renames\fR\&.
862 .RE
863 .PP
864 rename\-threshold=<n>
865 .RS 4
866 Deprecated synonym for
867 \fBfind\-renames=<n>\fR\&.
868 .RE
869 .PP
870 subtree[=<path>]
871 .RS 4
872 This option is a more advanced form of
873 \fIsubtree\fR
874 strategy, where the strategy makes a guess on how two trees must be shifted to match with each other when merging\&. Instead, the specified path is prefixed (or stripped from the beginning) to make the shape of two trees to match\&.
875 .RE
876 .RE
877 .PP
878 recursive
879 .RS 4
880 This can only resolve two heads using a 3\-way merge algorithm\&. When there is more than one common ancestor that can be used for 3\-way merge, it creates a merged tree of the common ancestors and uses that as the reference tree for the 3\-way merge\&. This has been reported to result in fewer merge conflicts without causing mismerges by tests done on actual merge commits taken from Linux 2\&.6 kernel development history\&. Additionally this can detect and handle merges involving renames\&. It does not make use of detected copies\&. This was the default strategy for resolving two heads from Git v0\&.99\&.9k until v2\&.33\&.0\&.
881 .sp
882 The
883 \fIrecursive\fR
884 strategy takes the same options as
885 \fIort\fR\&. However, there are three additional options that
886 \fIort\fR
887 ignores (not documented above) that are potentially useful with the
888 \fIrecursive\fR
889 strategy:
890 .PP
891 patience
892 .RS 4
893 Deprecated synonym for
894 \fBdiff\-algorithm=patience\fR\&.
895 .RE
896 .PP
897 diff\-algorithm=[patience|minimal|histogram|myers]
898 .RS 4
899 Use a different diff algorithm while merging, which can help avoid mismerges that occur due to unimportant matching lines (such as braces from distinct functions)\&. See also
900 \fBgit-diff\fR(1)
901 \fB\-\-diff\-algorithm\fR\&. Note that
902 \fBort\fR
903 specifically uses
904 \fBdiff\-algorithm=histogram\fR, while
905 \fBrecursive\fR
906 defaults to the
907 \fBdiff\&.algorithm\fR
908 config setting\&.
909 .RE
910 .PP
911 no\-renames
912 .RS 4
913 Turn off rename detection\&. This overrides the
914 \fBmerge\&.renames\fR
915 configuration variable\&. See also
916 \fBgit-diff\fR(1)
917 \fB\-\-no\-renames\fR\&.
918 .RE
919 .RE
920 .PP
921 resolve
922 .RS 4
923 This can only resolve two heads (i\&.e\&. the current branch and another branch you pulled from) using a 3\-way merge algorithm\&. It tries to carefully detect criss\-cross merge ambiguities\&. It does not handle renames\&.
924 .RE
925 .PP
926 octopus
927 .RS 4
928 This resolves cases with more than two heads, but refuses to do a complex merge that needs manual resolution\&. It is primarily meant to be used for bundling topic branch heads together\&. This is the default merge strategy when pulling or merging more than one branch\&.
929 .RE
930 .PP
931 ours
932 .RS 4
933 This resolves any number of heads, but the resulting tree of the merge is always that of the current branch head, effectively ignoring all changes from all other branches\&. It is meant to be used to supersede old development history of side branches\&. Note that this is different from the \-Xours option to the
934 \fIrecursive\fR
935 merge strategy\&.
936 .RE
937 .PP
938 subtree
939 .RS 4
940 This is a modified
941 \fBort\fR
942 strategy\&. When merging trees A and B, if B corresponds to a subtree of A, B is first adjusted to match the tree structure of A, instead of reading the trees at the same level\&. This adjustment is also done to the common ancestor tree\&.
943 .RE
944 .sp
945 With the strategies that use 3\-way merge (including the default, \fIort\fR), if a change is made on both branches, but later reverted on one of the branches, that change will be present in the merged result; some people find this behavior confusing\&. It occurs because only the heads and the merge base are considered when performing a merge, not the individual commits\&. The merge algorithm therefore considers the reverted change as no change at all, and substitutes the changed version instead\&.
946 .SH "CONFIGURATION"
947 .PP
948 branch\&.<name>\&.mergeOptions
949 .RS 4
950 Sets default options for merging into branch <name>\&. The syntax and supported options are the same as those of
951 \fBgit merge\fR, but option values containing whitespace characters are currently not supported\&.
952 .RE
953 .sp
954 Everything above this line in this section isn\(cqt included from the \fBgit-config\fR(1) documentation\&. The content that follows is the same as what\(cqs found there:
955 .PP
956 merge\&.conflictStyle
957 .RS 4
958 Specify the style in which conflicted hunks are written out to working tree files upon merge\&. The default is "merge", which shows a
959 \fB<<<<<<<\fR
960 conflict marker, changes made by one side, a
961 \fB=======\fR
962 marker, changes made by the other side, and then a
963 \fB>>>>>>>\fR
964 marker\&. An alternate style, "diff3", adds a
965 \fB|||||||\fR
966 marker and the original text before the
967 \fB=======\fR
968 marker\&. The "merge" style tends to produce smaller conflict regions than diff3, both because of the exclusion of the original text, and because when a subset of lines match on the two sides, they are just pulled out of the conflict region\&. Another alternate style, "zdiff3", is similar to diff3 but removes matching lines on the two sides from the conflict region when those matching lines appear near either the beginning or end of a conflict region\&.
969 .RE
970 .PP
971 merge\&.defaultToUpstream
972 .RS 4
973 If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last observed values stored in their remote\-tracking branches\&. The values of the
974 \fBbranch\&.<current branch>\&.merge\fR
975 that name the branches at the remote named by
976 \fBbranch\&.<current branch>\&.remote\fR
977 are consulted, and then they are mapped via
978 \fBremote\&.<remote>\&.fetch\fR
979 to their corresponding remote\-tracking branches, and the tips of these tracking branches are merged\&. Defaults to true\&.
980 .RE
981 .PP
982 merge\&.ff
983 .RS 4
984 By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit\&. Instead, the tip of the current branch is fast\-forwarded\&. When set to
985 \fBfalse\fR, this variable tells Git to create an extra merge commit in such a case (equivalent to giving the
986 \fB\-\-no\-ff\fR
987 option from the command line)\&. When set to
988 \fBonly\fR, only such fast\-forward merges are allowed (equivalent to giving the
989 \fB\-\-ff\-only\fR
990 option from the command line)\&.
991 .RE
992 .PP
993 merge\&.verifySignatures
994 .RS 4
995 If true, this is equivalent to the \-\-verify\-signatures command line option\&. See
996 \fBgit-merge\fR(1)
997 for details\&.
998 .RE
999 .PP
1000 merge\&.branchdesc
1001 .RS 4
1002 In addition to branch names, populate the log message with the branch description text associated with them\&. Defaults to false\&.
1003 .RE
1004 .PP
1005 merge\&.log
1006 .RS 4
1007 In addition to branch names, populate the log message with at most the specified number of one\-line descriptions from the actual commits that are being merged\&. Defaults to false, and true is a synonym for 20\&.
1008 .RE
1009 .PP
1010 merge\&.suppressDest
1011 .RS 4
1012 By adding a glob that matches the names of integration branches to this multi\-valued configuration variable, the default merge message computed for merges into these integration branches will omit "into <branch name>" from its title\&.
1013 .sp
1014 An element with an empty value can be used to clear the list of globs accumulated from previous configuration entries\&. When there is no
1015 \fBmerge\&.suppressDest\fR
1016 variable defined, the default value of
1017 \fBmaster\fR
1018 is used for backward compatibility\&.
1019 .RE
1020 .PP
1021 merge\&.renameLimit
1022 .RS 4
1023 The number of files to consider in the exhaustive portion of rename detection during a merge\&. If not specified, defaults to the value of diff\&.renameLimit\&. If neither merge\&.renameLimit nor diff\&.renameLimit are specified, currently defaults to 7000\&. This setting has no effect if rename detection is turned off\&.
1024 .RE
1025 .PP
1026 merge\&.renames
1027 .RS 4
1028 Whether Git detects renames\&. If set to "false", rename detection is disabled\&. If set to "true", basic rename detection is enabled\&. Defaults to the value of diff\&.renames\&.
1029 .RE
1030 .PP
1031 merge\&.directoryRenames
1032 .RS 4
1033 Whether Git detects directory renames, affecting what happens at merge time to new files added to a directory on one side of history when that directory was renamed on the other side of history\&. If merge\&.directoryRenames is set to "false", directory rename detection is disabled, meaning that such new files will be left behind in the old directory\&. If set to "true", directory rename detection is enabled, meaning that such new files will be moved into the new directory\&. If set to "conflict", a conflict will be reported for such paths\&. If merge\&.renames is false, merge\&.directoryRenames is ignored and treated as false\&. Defaults to "conflict"\&.
1034 .RE
1035 .PP
1036 merge\&.renormalize
1037 .RS 4
1038 Tell Git that canonical representation of files in the repository has changed over time (e\&.g\&. earlier commits record text files with CRLF line endings, but recent ones use LF line endings)\&. In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts\&. For more information, see section "Merging branches with differing checkin/checkout attributes" in
1039 \fBgitattributes\fR(5)\&.
1040 .RE
1041 .PP
1042 merge\&.stat
1043 .RS 4
1044 Whether to print the diffstat between ORIG_HEAD and the merge result at the end of the merge\&. True by default\&.
1045 .RE
1046 .PP
1047 merge\&.autoStash
1048 .RS 4
1049 When set to true, automatically create a temporary stash entry before the operation begins, and apply it after the operation ends\&. This means that you can run merge on a dirty worktree\&. However, use with care: the final stash application after a successful merge might result in non\-trivial conflicts\&. This option can be overridden by the
1050 \fB\-\-no\-autostash\fR
1051 and
1052 \fB\-\-autostash\fR
1053 options of
1054 \fBgit-merge\fR(1)\&. Defaults to false\&.
1055 .RE
1056 .PP
1057 merge\&.tool
1058 .RS 4
1059 Controls which merge tool is used by
1060 \fBgit-mergetool\fR(1)\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom merge tool and requires that a corresponding mergetool\&.<tool>\&.cmd variable is defined\&.
1061 .RE
1062 .PP
1063 merge\&.guitool
1064 .RS 4
1065 Controls which merge tool is used by
1066 \fBgit-mergetool\fR(1)
1067 when the \-g/\-\-gui flag is specified\&. The list below shows the valid built\-in values\&. Any other value is treated as a custom merge tool and requires that a corresponding mergetool\&.<guitool>\&.cmd variable is defined\&.
1068 .PP
1069 \fBaraxis\fR
1070 .RS 4
1071 Use Araxis Merge (requires a graphical session)
1072 .RE
1073 .PP
1074 \fBbc\fR
1075 .RS 4
1076 Use Beyond Compare (requires a graphical session)
1077 .RE
1078 .PP
1079 \fBbc3\fR
1080 .RS 4
1081 Use Beyond Compare (requires a graphical session)
1082 .RE
1083 .PP
1084 \fBbc4\fR
1085 .RS 4
1086 Use Beyond Compare (requires a graphical session)
1087 .RE
1088 .PP
1089 \fBcodecompare\fR
1090 .RS 4
1091 Use Code Compare (requires a graphical session)
1092 .RE
1093 .PP
1094 \fBdeltawalker\fR
1095 .RS 4
1096 Use DeltaWalker (requires a graphical session)
1097 .RE
1098 .PP
1099 \fBdiffmerge\fR
1100 .RS 4
1101 Use DiffMerge (requires a graphical session)
1102 .RE
1103 .PP
1104 \fBdiffuse\fR
1105 .RS 4
1106 Use Diffuse (requires a graphical session)
1107 .RE
1108 .PP
1109 \fBecmerge\fR
1110 .RS 4
1111 Use ECMerge (requires a graphical session)
1112 .RE
1113 .PP
1114 \fBemerge\fR
1115 .RS 4
1116 Use Emacs\*(Aq Emerge
1117 .RE
1118 .PP
1119 \fBexamdiff\fR
1120 .RS 4
1121 Use ExamDiff Pro (requires a graphical session)
1122 .RE
1123 .PP
1124 \fBguiffy\fR
1125 .RS 4
1126 Use Guiffy\(cqs Diff Tool (requires a graphical session)
1127 .RE
1128 .PP
1129 \fBgvimdiff\fR
1130 .RS 4
1131 Use gVim (requires a graphical session) with a custom layout (see
1132 \fBgit help mergetool\fR\*(Aqs
1133 \fBBACKEND SPECIFIC HINTS\fR
1134 section)
1135 .RE
1136 .PP
1137 \fBgvimdiff1\fR
1138 .RS 4
1139 Use gVim (requires a graphical session) with a 2 panes layout (LOCAL and REMOTE)
1140 .RE
1141 .PP
1142 \fBgvimdiff2\fR
1143 .RS 4
1144 Use gVim (requires a graphical session) with a 3 panes layout (LOCAL, MERGED and REMOTE)
1145 .RE
1146 .PP
1147 \fBgvimdiff3\fR
1148 .RS 4
1149 Use gVim (requires a graphical session) where only the MERGED file is shown
1150 .RE
1151 .PP
1152 \fBkdiff3\fR
1153 .RS 4
1154 Use KDiff3 (requires a graphical session)
1155 .RE
1156 .PP
1157 \fBmeld\fR
1158 .RS 4
1159 Use Meld (requires a graphical session) with optional
1160 \fBauto merge\fR
1161 (see
1162 \fBgit help mergetool\fR\*(Aqs
1163 \fBCONFIGURATION\fR
1164 section)
1165 .RE
1166 .PP
1167 \fBnvimdiff\fR
1168 .RS 4
1169 Use Neovim with a custom layout (see
1170 \fBgit help mergetool\fR\*(Aqs
1171 \fBBACKEND SPECIFIC HINTS\fR
1172 section)
1173 .RE
1174 .PP
1175 \fBnvimdiff1\fR
1176 .RS 4
1177 Use Neovim with a 2 panes layout (LOCAL and REMOTE)
1178 .RE
1179 .PP
1180 \fBnvimdiff2\fR
1181 .RS 4
1182 Use Neovim with a 3 panes layout (LOCAL, MERGED and REMOTE)
1183 .RE
1184 .PP
1185 \fBnvimdiff3\fR
1186 .RS 4
1187 Use Neovim where only the MERGED file is shown
1188 .RE
1189 .PP
1190 \fBopendiff\fR
1191 .RS 4
1192 Use FileMerge (requires a graphical session)
1193 .RE
1194 .PP
1195 \fBp4merge\fR
1196 .RS 4
1197 Use HelixCore P4Merge (requires a graphical session)
1198 .RE
1199 .PP
1200 \fBsmerge\fR
1201 .RS 4
1202 Use Sublime Merge (requires a graphical session)
1203 .RE
1204 .PP
1205 \fBtkdiff\fR
1206 .RS 4
1207 Use TkDiff (requires a graphical session)
1208 .RE
1209 .PP
1210 \fBtortoisemerge\fR
1211 .RS 4
1212 Use TortoiseMerge (requires a graphical session)
1213 .RE
1214 .PP
1215 \fBvimdiff\fR
1216 .RS 4
1217 Use Vim with a custom layout (see
1218 \fBgit help mergetool\fR\*(Aqs
1219 \fBBACKEND SPECIFIC HINTS\fR
1220 section)
1221 .RE
1222 .PP
1223 \fBvimdiff1\fR
1224 .RS 4
1225 Use Vim with a 2 panes layout (LOCAL and REMOTE)
1226 .RE
1227 .PP
1228 \fBvimdiff2\fR
1229 .RS 4
1230 Use Vim with a 3 panes layout (LOCAL, MERGED and REMOTE)
1231 .RE
1232 .PP
1233 \fBvimdiff3\fR
1234 .RS 4
1235 Use Vim where only the MERGED file is shown
1236 .RE
1237 .PP
1238 \fBwinmerge\fR
1239 .RS 4
1240 Use WinMerge (requires a graphical session)
1241 .RE
1242 .PP
1243 \fBxxdiff\fR
1244 .RS 4
1245 Use xxdiff (requires a graphical session)
1246 .RE
1247 .RE
1248 .PP
1249 merge\&.verbosity
1250 .RS 4
1251 Controls the amount of output shown by the recursive merge strategy\&. Level 0 outputs nothing except a final error message if conflicts were detected\&. Level 1 outputs only conflicts, 2 outputs conflicts and file changes\&. Level 5 and above outputs debugging information\&. The default is level 2\&. Can be overridden by the
1252 \fBGIT_MERGE_VERBOSITY\fR
1253 environment variable\&.
1254 .RE
1255 .PP
1256 merge\&.<driver>\&.name
1257 .RS 4
1258 Defines a human\-readable name for a custom low\-level merge driver\&. See
1259 \fBgitattributes\fR(5)
1260 for details\&.
1261 .RE
1262 .PP
1263 merge\&.<driver>\&.driver
1264 .RS 4
1265 Defines the command that implements a custom low\-level merge driver\&. See
1266 \fBgitattributes\fR(5)
1267 for details\&.
1268 .RE
1269 .PP
1270 merge\&.<driver>\&.recursive
1271 .RS 4
1272 Names a low\-level merge driver to be used when performing an internal merge between common ancestors\&. See
1273 \fBgitattributes\fR(5)
1274 for details\&.
1275 .RE
1276 .SH "SEE ALSO"
1277 .sp
1278 \fBgit-fmt-merge-msg\fR(1), \fBgit-pull\fR(1), \fBgitattributes\fR(5), \fBgit-reset\fR(1), \fBgit-diff\fR(1), \fBgit-ls-files\fR(1), \fBgit-add\fR(1), \fBgit-rm\fR(1), \fBgit-mergetool\fR(1)
1279 .SH "GIT"
1280 .sp
1281 Part of the \fBgit\fR(1) suite