]>
Commit | Line | Data |
---|---|---|
0f69be53 JH |
1 | git-merge(1) |
2 | ============ | |
0f69be53 JH |
3 | |
4 | NAME | |
5 | ---- | |
c3f0baac | 6 | git-merge - Join two or more development histories together |
0f69be53 JH |
7 | |
8 | ||
9 | SYNOPSIS | |
10 | -------- | |
17bcdad3 | 11 | [verse] |
f8246281 | 12 | 'git merge' [-n] [--stat] [--no-commit] [--squash] [--[no-]edit] |
a1f3dd7e | 13 | [--no-verify] [-s <strategy>] [-X <strategy-option>] [-S[<keyid>]] |
09c2cb87 | 14 | [--[no-]allow-unrelated-histories] |
bd2bc942 JH |
15 | [--[no-]rerere-autoupdate] [-m <msg>] [-F <file>] |
16 | [--into-name <branch>] [<commit>...] | |
437591a9 | 17 | 'git merge' (--continue | --abort | --quit) |
0f69be53 JH |
18 | |
19 | DESCRIPTION | |
20 | ----------- | |
b40bb374 JN |
21 | Incorporates changes from the named commits (since the time their |
22 | histories diverged from the current branch) into the current | |
23 | branch. This command is used by 'git pull' to incorporate changes | |
24 | from another repository and can be used by hand to merge changes | |
25 | from one branch into another. | |
26 | ||
27 | Assume the following history exists and the current branch is | |
28 | "`master`": | |
29 | ||
30 | ------------ | |
31 | A---B---C topic | |
32 | / | |
33 | D---E---F---G master | |
34 | ------------ | |
35 | ||
36 | Then "`git merge topic`" will replay the changes made on the | |
37 | `topic` branch since it diverged from `master` (i.e., `E`) until | |
38 | its current commit (`C`) on top of `master`, and record the result | |
39 | in a new commit along with the names of the two parent commits and | |
40 | a log message from the user describing the changes. | |
41 | ||
42 | ------------ | |
43 | A---B---C topic | |
44 | / \ | |
45 | D---E---F---G---H master | |
46 | ------------ | |
0f69be53 | 47 | |
b4391657 | 48 | The second syntax ("`git merge --abort`") can only be run after the |
35d2fffd JH |
49 | merge has resulted in conflicts. 'git merge --abort' will abort the |
50 | merge process and try to reconstruct the pre-merge state. However, | |
51 | if there were uncommitted changes when the merge started (and | |
52 | especially if those changes were further modified after the merge | |
53 | was started), 'git merge --abort' will in some cases be unable to | |
54 | reconstruct the original (pre-merge) changes. Therefore: | |
55 | ||
76b80cdf MM |
56 | *Warning*: Running 'git merge' with non-trivial uncommitted changes is |
57 | discouraged: while possible, it may leave you in a state that is hard to | |
e330d8ca | 58 | back out of in the case of a conflict. |
dee48c3c | 59 | |
28cb0602 | 60 | The third syntax ("`git merge --continue`") can only be run after the |
367ff694 | 61 | merge has resulted in conflicts. |
0f69be53 JH |
62 | |
63 | OPTIONS | |
64 | ------- | |
359ff693 EN |
65 | :git-merge: 1 |
66 | ||
93d69d86 | 67 | include::merge-options.txt[] |
0f69be53 | 68 | |
dee48c3c | 69 | -m <msg>:: |
0f8a02c6 | 70 | Set the commit message to be used for the merge commit (in |
f0ecac2b | 71 | case one is created). |
af77aee9 NP |
72 | + |
73 | If `--log` is specified, a shortlog of the commits being merged | |
74 | will be appended to the specified message. | |
75 | + | |
76 | The 'git fmt-merge-msg' command can be | |
77 | used to give a good default for automated 'git merge' | |
561d2b79 | 78 | invocations. The automated message can include the branch description. |
3c64314c | 79 | |
bd2bc942 JH |
80 | --into-name <branch>:: |
81 | Prepare the default merge message as if merging to the branch | |
82 | `<branch>`, instead of the name of the real branch to which | |
83 | the merge is made. | |
84 | ||
920f22e6 JS |
85 | -F <file>:: |
86 | --file=<file>:: | |
87 | Read the commit message to be used for the merge commit (in | |
88 | case one is created). | |
89 | + | |
90 | If `--log` is specified, a shortlog of the commits being merged | |
91 | will be appended to the specified message. | |
92 | ||
0dbc715a | 93 | include::rerere-options.txt[] |
cb6020bb | 94 | |
9d223d43 NTND |
95 | --overwrite-ignore:: |
96 | --no-overwrite-ignore:: | |
97 | Silently overwrite ignored files from the merge result. This | |
98 | is the default behavior. Use `--no-overwrite-ignore` to abort. | |
99 | ||
35d2fffd JH |
100 | --abort:: |
101 | Abort the current conflict resolution process, and | |
a03b5553 DL |
102 | try to reconstruct the pre-merge state. If an autostash entry is |
103 | present, apply it to the worktree. | |
35d2fffd JH |
104 | + |
105 | If there were uncommitted worktree changes present when the merge | |
106 | started, 'git merge --abort' will in some cases be unable to | |
107 | reconstruct these changes. It is therefore recommended to always | |
108 | commit or stash your changes before running 'git merge'. | |
109 | + | |
110 | 'git merge --abort' is equivalent to 'git reset --merge' when | |
a03b5553 DL |
111 | `MERGE_HEAD` is present unless `MERGE_AUTOSTASH` is also present in |
112 | which case 'git merge --abort' applies the stash entry to the worktree | |
113 | whereas 'git reset --merge' will save the stashed changes in the stash | |
c5e786ab | 114 | list. |
35d2fffd | 115 | |
f3f8311e NTND |
116 | --quit:: |
117 | Forget about the current merge in progress. Leave the index | |
a03b5553 | 118 | and the working tree as-is. If `MERGE_AUTOSTASH` is present, the |
c5e786ab | 119 | stash entry will be saved to the stash list. |
f3f8311e | 120 | |
367ff694 CP |
121 | --continue:: |
122 | After a 'git merge' stops due to conflicts you can conclude the | |
123 | merge by running 'git merge --continue' (see "HOW TO RESOLVE | |
124 | CONFLICTS" section below). | |
125 | ||
57bddb11 TR |
126 | <commit>...:: |
127 | Commits, usually other branch heads, to merge into our branch. | |
93e535a5 JH |
128 | Specifying more than one commit will create a merge with |
129 | more than two parents (affectionately called an Octopus merge). | |
130 | + | |
a01f7f2b FC |
131 | If no commit is given from the command line, merge the remote-tracking |
132 | branches that the current branch is configured to use as its upstream. | |
93e535a5 | 133 | See also the configuration section of this manual page. |
74e8bc59 JH |
134 | + |
135 | When `FETCH_HEAD` (and no other commit) is specified, the branches | |
136 | recorded in the `.git/FETCH_HEAD` file by the previous invocation | |
137 | of `git fetch` for merging are merged to the current branch. | |
0f69be53 | 138 | |
bb73d73c | 139 | |
30f2bade JN |
140 | PRE-MERGE CHECKS |
141 | ---------------- | |
0f69be53 | 142 | |
30f2bade JN |
143 | Before applying outside changes, you should get your own work in |
144 | good shape and committed locally, so it will not be clobbered if | |
145 | there are conflicts. See also linkgit:git-stash[1]. | |
146 | 'git pull' and 'git merge' will stop without doing anything when | |
147 | local uncommitted changes overlap with files that 'git pull'/'git | |
148 | merge' may need to update. | |
3ae854c3 | 149 | |
30f2bade JN |
150 | To avoid recording unrelated changes in the merge commit, |
151 | 'git pull' and 'git merge' will also abort if there are any changes | |
55f39cf7 EN |
152 | registered in the index relative to the `HEAD` commit. (Special |
153 | narrow exceptions to this rule may exist depending on which merge | |
154 | strategy is in use, but generally, the index must match HEAD.) | |
dbddb714 | 155 | |
30f2bade | 156 | If all named commits are already ancestors of `HEAD`, 'git merge' |
7560f547 | 157 | will exit early with the message "Already up to date." |
3ae854c3 | 158 | |
29280311 JN |
159 | FAST-FORWARD MERGE |
160 | ------------------ | |
161 | ||
162 | Often the current branch head is an ancestor of the named commit. | |
163 | This is the most common case especially when invoked from 'git | |
164 | pull': you are tracking an upstream repository, you have committed | |
165 | no local changes, and now you want to update to a newer upstream | |
166 | revision. In this case, a new commit is not needed to store the | |
167 | combined history; instead, the `HEAD` (along with the index) is | |
168 | updated to point at the named commit, without creating an extra | |
169 | merge commit. | |
170 | ||
171 | This behavior can be suppressed with the `--no-ff` option. | |
ffb1a4be | 172 | |
ebef7e50 JN |
173 | TRUE MERGE |
174 | ---------- | |
c0be8aa0 | 175 | |
29280311 JN |
176 | Except in a fast-forward merge (see above), the branches to be |
177 | merged must be tied together by a merge commit that has both of them | |
178 | as its parents. | |
ffb1a4be | 179 | |
ebef7e50 JN |
180 | A merged version reconciling the changes from all branches to be |
181 | merged is committed, and your `HEAD`, index, and working tree are | |
182 | updated to it. It is possible to have modifications in the working | |
183 | tree as long as they do not overlap; the update will preserve them. | |
ffb1a4be | 184 | |
ebef7e50 JN |
185 | When it is not obvious how to reconcile the changes, the following |
186 | happens: | |
ffb1a4be | 187 | |
ebef7e50 JN |
188 | 1. The `HEAD` pointer stays the same. |
189 | 2. The `MERGE_HEAD` ref is set to point to the other branch head. | |
190 | 3. Paths that merged cleanly are updated both in the index file and | |
ffb1a4be | 191 | in your working tree. |
ebef7e50 JN |
192 | 4. For conflicting paths, the index file records up to three |
193 | versions: stage 1 stores the version from the common ancestor, | |
194 | stage 2 from `HEAD`, and stage 3 from `MERGE_HEAD` (you | |
b1889c36 | 195 | can inspect the stages with `git ls-files -u`). The working |
29b802aa | 196 | tree files contain the result of the "merge" program; i.e. 3-way |
ebef7e50 JN |
197 | merge results with familiar conflict markers `<<<` `===` `>>>`. |
198 | 5. No other changes are made. In particular, the local | |
ffb1a4be JH |
199 | modifications you had before you started merge will stay the |
200 | same and the index entries for them stay as they were, | |
201 | i.e. matching `HEAD`. | |
202 | ||
ed4a6baa | 203 | If you tried a merge which resulted in complex conflicts and |
35d2fffd | 204 | want to start over, you can recover with `git merge --abort`. |
ed4a6baa | 205 | |
77c72780 JH |
206 | MERGING TAG |
207 | ----------- | |
208 | ||
209 | When merging an annotated (and possibly signed) tag, Git always | |
210 | creates a merge commit even if a fast-forward merge is possible, and | |
211 | the commit message template is prepared with the tag message. | |
212 | Additionally, if the tag is signed, the signature check is reported | |
213 | as a comment in the message template. See also linkgit:git-tag[1]. | |
214 | ||
215 | When you want to just integrate with the work leading to the commit | |
216 | that happens to be tagged, e.g. synchronizing with an upstream | |
217 | release point, you may not want to make an unnecessary merge commit. | |
218 | ||
219 | In such a case, you can "unwrap" the tag yourself before feeding it | |
220 | to `git merge`, or pass `--ff-only` when you do not have any work on | |
221 | your own. e.g. | |
222 | ||
e45bda87 | 223 | ---- |
77c72780 JH |
224 | git fetch origin |
225 | git merge v1.2.3^0 | |
226 | git merge --ff-only v1.2.3 | |
e45bda87 | 227 | ---- |
77c72780 JH |
228 | |
229 | ||
70a3f897 JH |
230 | HOW CONFLICTS ARE PRESENTED |
231 | --------------------------- | |
232 | ||
233 | During a merge, the working tree files are updated to reflect the result | |
234 | of the merge. Among the changes made to the common ancestor's version, | |
235 | non-overlapping ones (that is, you changed an area of the file while the | |
236 | other side left that area intact, or vice versa) are incorporated in the | |
237 | final result verbatim. When both sides made changes to the same area, | |
2de9b711 | 238 | however, Git cannot randomly pick one side over the other, and asks you to |
70a3f897 JH |
239 | resolve it by leaving what both sides did to that area. |
240 | ||
2de9b711 | 241 | By default, Git uses the same style as the one used by the "merge" program |
70a3f897 JH |
242 | from the RCS suite to present such a conflicted hunk, like this: |
243 | ||
244 | ------------ | |
245 | Here are lines that are either unchanged from the common | |
ddfc44a8 EN |
246 | ancestor, or cleanly resolved because only one side changed, |
247 | or cleanly resolved because both sides changed the same way. | |
70a3f897 JH |
248 | <<<<<<< yours:sample.txt |
249 | Conflict resolution is hard; | |
250 | let's go shopping. | |
251 | ======= | |
252 | Git makes conflict resolution easy. | |
253 | >>>>>>> theirs:sample.txt | |
254 | And here is another line that is cleanly resolved or unmodified. | |
255 | ------------ | |
256 | ||
29b802aa | 257 | The area where a pair of conflicting changes happened is marked with markers |
dcb11263 | 258 | `<<<<<<<`, `=======`, and `>>>>>>>`. The part before the `=======` |
29b802aa | 259 | is typically your side, and the part afterwards is typically their side. |
70a3f897 | 260 | |
29b802aa RW |
261 | The default format does not show what the original said in the conflicting |
262 | area. You cannot tell how many lines are deleted and replaced with | |
263 | Barbie's remark on your side. The only thing you can tell is that your | |
70a3f897 JH |
264 | side wants to say it is hard and you'd prefer to go shopping, while the |
265 | other side wants to claim it is easy. | |
266 | ||
da0005b8 | 267 | An alternative style can be used by setting the "merge.conflictStyle" |
ddfc44a8 EN |
268 | configuration variable to either "diff3" or "zdiff3". In "diff3" |
269 | style, the above conflict may look like this: | |
70a3f897 JH |
270 | |
271 | ------------ | |
272 | Here are lines that are either unchanged from the common | |
ddfc44a8 | 273 | ancestor, or cleanly resolved because only one side changed, |
70a3f897 | 274 | <<<<<<< yours:sample.txt |
ddfc44a8 | 275 | or cleanly resolved because both sides changed the same way. |
70a3f897 JH |
276 | Conflict resolution is hard; |
277 | let's go shopping. | |
ddfc44a8 EN |
278 | ||||||| base:sample.txt |
279 | or cleanly resolved because both sides changed identically. | |
280 | Conflict resolution is hard. | |
281 | ======= | |
282 | or cleanly resolved because both sides changed the same way. | |
283 | Git makes conflict resolution easy. | |
284 | >>>>>>> theirs:sample.txt | |
285 | And here is another line that is cleanly resolved or unmodified. | |
286 | ------------ | |
287 | ||
288 | while in "zdiff3" style, it may look like this: | |
289 | ||
290 | ------------ | |
291 | Here are lines that are either unchanged from the common | |
292 | ancestor, or cleanly resolved because only one side changed, | |
293 | or cleanly resolved because both sides changed the same way. | |
294 | <<<<<<< yours:sample.txt | |
295 | Conflict resolution is hard; | |
296 | let's go shopping. | |
297 | ||||||| base:sample.txt | |
298 | or cleanly resolved because both sides changed identically. | |
70a3f897 JH |
299 | Conflict resolution is hard. |
300 | ======= | |
301 | Git makes conflict resolution easy. | |
302 | >>>>>>> theirs:sample.txt | |
303 | And here is another line that is cleanly resolved or unmodified. | |
304 | ------------ | |
305 | ||
dcb11263 CJ |
306 | In addition to the `<<<<<<<`, `=======`, and `>>>>>>>` markers, it uses |
307 | another `|||||||` marker that is followed by the original text. You can | |
70a3f897 JH |
308 | tell that the original just stated a fact, and your side simply gave in to |
309 | that statement and gave up, while the other side tried to have a more | |
310 | positive attitude. You can sometimes come up with a better resolution by | |
311 | viewing the original. | |
312 | ||
313 | ||
314 | HOW TO RESOLVE CONFLICTS | |
315 | ------------------------ | |
316 | ||
ffb1a4be JH |
317 | After seeing a conflict, you can do two things: |
318 | ||
29b802aa | 319 | * Decide not to merge. The only clean-ups you need are to reset |
ffb1a4be | 320 | the index file to the `HEAD` commit to reverse 2. and to clean |
35d2fffd JH |
321 | up working tree changes made by 2. and 3.; `git merge --abort` |
322 | can be used for this. | |
ffb1a4be | 323 | |
34ad1afa DH |
324 | * Resolve the conflicts. Git will mark the conflicts in |
325 | the working tree. Edit the files into shape and | |
e2de82f2 MG |
326 | 'git add' them to the index. Use 'git commit' or |
327 | 'git merge --continue' to seal the deal. The latter command | |
328 | checks whether there is a (interrupted) merge in progress | |
329 | before calling 'git commit'. | |
ffb1a4be | 330 | |
34ad1afa DH |
331 | You can work through the conflict with a number of tools: |
332 | ||
ca768288 | 333 | * Use a mergetool. `git mergetool` to launch a graphical |
34ad1afa DH |
334 | mergetool which will work you through the merge. |
335 | ||
ca768288 | 336 | * Look at the diffs. `git diff` will show a three-way diff, |
3588cf94 JN |
337 | highlighting changes from both the `HEAD` and `MERGE_HEAD` |
338 | versions. | |
34ad1afa | 339 | |
3588cf94 JN |
340 | * Look at the diffs from each branch. `git log --merge -p <path>` |
341 | will show diffs first for the `HEAD` version and then the | |
342 | `MERGE_HEAD` version. | |
34ad1afa | 343 | |
ca768288 | 344 | * Look at the originals. `git show :1:filename` shows the |
3588cf94 JN |
345 | common ancestor, `git show :2:filename` shows the `HEAD` |
346 | version, and `git show :3:filename` shows the `MERGE_HEAD` | |
347 | version. | |
ffb1a4be | 348 | |
d504f697 CB |
349 | |
350 | EXAMPLES | |
351 | -------- | |
352 | ||
353 | * Merge branches `fixes` and `enhancements` on top of | |
354 | the current branch, making an octopus merge: | |
355 | + | |
356 | ------------------------------------------------ | |
357 | $ git merge fixes enhancements | |
358 | ------------------------------------------------ | |
359 | ||
360 | * Merge branch `obsolete` into the current branch, using `ours` | |
361 | merge strategy: | |
362 | + | |
363 | ------------------------------------------------ | |
364 | $ git merge -s ours obsolete | |
365 | ------------------------------------------------ | |
366 | ||
367 | * Merge branch `maint` into the current branch, but do not make | |
368 | a new commit automatically: | |
369 | + | |
370 | ------------------------------------------------ | |
371 | $ git merge --no-commit maint | |
372 | ------------------------------------------------ | |
373 | + | |
374 | This can be used when you want to include further changes to the | |
375 | merge, or want to write your own merge commit message. | |
376 | + | |
377 | You should refrain from abusing this option to sneak substantial | |
378 | changes into a merge commit. Small fixups like bumping | |
379 | release/version name would be acceptable. | |
380 | ||
381 | ||
a4081bac JN |
382 | include::merge-strategies.txt[] |
383 | ||
35e9d630 JN |
384 | CONFIGURATION |
385 | ------------- | |
35e9d630 | 386 | |
da0005b8 | 387 | branch.<name>.mergeOptions:: |
35e9d630 JN |
388 | Sets default options for merging into branch <name>. The syntax and |
389 | supported options are the same as those of 'git merge', but option | |
390 | values containing whitespace characters are currently not supported. | |
391 | ||
18d89fe2 ÆAB |
392 | include::includes/cmd-config-section-rest.txt[] |
393 | ||
394 | include::config/merge.txt[] | |
395 | ||
3c64314c PB |
396 | SEE ALSO |
397 | -------- | |
5162e697 | 398 | linkgit:git-fmt-merge-msg[1], linkgit:git-pull[1], |
483bc4f0 JN |
399 | linkgit:gitattributes[5], |
400 | linkgit:git-reset[1], | |
401 | linkgit:git-diff[1], linkgit:git-ls-files[1], | |
402 | linkgit:git-add[1], linkgit:git-rm[1], | |
403 | linkgit:git-mergetool[1] | |
3c64314c | 404 | |
0f69be53 JH |
405 | GIT |
406 | --- | |
9e1f0a85 | 407 | Part of the linkgit:git[1] suite |