]>
Commit | Line | Data |
---|---|---|
215a7ad1 JH |
1 | git-rebase(1) |
2 | ============= | |
7fc9d69f JH |
3 | |
4 | NAME | |
5 | ---- | |
c3f0baac | 6 | git-rebase - Forward-port local commits to the updated upstream head |
7fc9d69f JH |
7 | |
8 | SYNOPSIS | |
9 | -------- | |
e448ff87 | 10 | [verse] |
c2145384 | 11 | 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] |
95c68267 | 12 | [<upstream> [<branch>]] |
0cd993a7 | 13 | 'git rebase' [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] |
be496621 | 14 | --root [<branch>] |
eb9a7cb4 | 15 | 'git rebase' --continue | --skip | --abort | --edit-todo |
031321c6 | 16 | |
7fc9d69f JH |
17 | DESCRIPTION |
18 | ----------- | |
0b444cdb | 19 | If <branch> is specified, 'git rebase' will perform an automatic |
5ca2db53 SP |
20 | `git checkout <branch>` before doing anything else. Otherwise |
21 | it remains on the current branch. | |
22 | ||
15a147e6 | 23 | If <upstream> is not specified, the upstream configured in |
f51a48ec SO |
24 | branch.<name>.remote and branch.<name>.merge options will be used (see |
25 | linkgit:git-config[1] for details) and the `--fork-point` option is | |
26 | assumed. If you are currently not on any branch or if the current | |
27 | branch does not have a configured upstream, the rebase will abort. | |
15a147e6 | 28 | |
5ca2db53 SP |
29 | All changes made by commits in the current branch but that are not |
30 | in <upstream> are saved to a temporary area. This is the same set | |
f51a48ec SO |
31 | of commits that would be shown by `git log <upstream>..HEAD`; or by |
32 | `git log 'fork_point'..HEAD`, if `--fork-point` is active (see the | |
33 | description on `--fork-point` below); or by `git log HEAD`, if the | |
34 | `--root` option is specified. | |
5ca2db53 SP |
35 | |
36 | The current branch is reset to <upstream>, or <newbase> if the | |
37 | --onto option was supplied. This has the exact same effect as | |
9869099b BG |
38 | `git reset --hard <upstream>` (or <newbase>). ORIG_HEAD is set |
39 | to point at the tip of the branch before the reset. | |
5ca2db53 SP |
40 | |
41 | The commits that were previously saved into the temporary area are | |
ff905462 JK |
42 | then reapplied to the current branch, one by one, in order. Note that |
43 | any commits in HEAD which introduce the same textual changes as a commit | |
44 | in HEAD..<upstream> are omitted (i.e., a patch already accepted upstream | |
45 | with a different commit message or timestamp will be skipped). | |
69a60af5 | 46 | |
031321c6 SE |
47 | It is possible that a merge failure will prevent this process from being |
48 | completely automatic. You will have to resolve any such merge failure | |
cc120056 | 49 | and run `git rebase --continue`. Another option is to bypass the commit |
5960bc9d | 50 | that caused the merge failure with `git rebase --skip`. To check out the |
51ef1daa JS |
51 | original <branch> and remove the .git/rebase-apply working files, use the |
52 | command `git rebase --abort` instead. | |
031321c6 | 53 | |
69a60af5 CW |
54 | Assume the following history exists and the current branch is "topic": |
55 | ||
031321c6 | 56 | ------------ |
69a60af5 CW |
57 | A---B---C topic |
58 | / | |
59 | D---E---F---G master | |
031321c6 | 60 | ------------ |
69a60af5 | 61 | |
228382ae | 62 | From this point, the result of either of the following commands: |
69a60af5 | 63 | |
031321c6 | 64 | |
b1889c36 JN |
65 | git rebase master |
66 | git rebase master topic | |
69a60af5 CW |
67 | |
68 | would be: | |
69 | ||
031321c6 | 70 | ------------ |
69a60af5 CW |
71 | A'--B'--C' topic |
72 | / | |
73 | D---E---F---G master | |
031321c6 | 74 | ------------ |
69a60af5 | 75 | |
ee55703b DN |
76 | *NOTE:* The latter form is just a short-hand of `git checkout topic` |
77 | followed by `git rebase master`. When rebase exits `topic` will | |
78 | remain the checked-out branch. | |
69a60af5 | 79 | |
ff905462 JK |
80 | If the upstream branch already contains a change you have made (e.g., |
81 | because you mailed a patch which was applied upstream), then that commit | |
b1889c36 | 82 | will be skipped. For example, running `git rebase master` on the |
ff905462 JK |
83 | following history (in which A' and A introduce the same set of changes, |
84 | but have different committer information): | |
85 | ||
86 | ------------ | |
87 | A---B---C topic | |
88 | / | |
89 | D---E---A'---F master | |
90 | ------------ | |
91 | ||
92 | will result in: | |
93 | ||
94 | ------------ | |
95 | B'---C' topic | |
96 | / | |
97 | D---E---A'---F master | |
98 | ------------ | |
99 | ||
e52775f4 JN |
100 | Here is how you would transplant a topic branch based on one |
101 | branch to another, to pretend that you forked the topic branch | |
102 | from the latter branch, using `rebase --onto`. | |
69a60af5 | 103 | |
e52775f4 | 104 | First let's assume your 'topic' is based on branch 'next'. |
e2b850b2 | 105 | For example, a feature developed in 'topic' depends on some |
e52775f4 | 106 | functionality which is found in 'next'. |
69a60af5 | 107 | |
031321c6 | 108 | ------------ |
e52775f4 JN |
109 | o---o---o---o---o master |
110 | \ | |
111 | o---o---o---o---o next | |
112 | \ | |
113 | o---o---o topic | |
114 | ------------ | |
115 | ||
e2b850b2 GD |
116 | We want to make 'topic' forked from branch 'master'; for example, |
117 | because the functionality on which 'topic' depends was merged into the | |
118 | more stable 'master' branch. We want our tree to look like this: | |
e52775f4 JN |
119 | |
120 | ------------ | |
121 | o---o---o---o---o master | |
122 | | \ | |
123 | | o'--o'--o' topic | |
124 | \ | |
125 | o---o---o---o---o next | |
031321c6 | 126 | ------------ |
7fc9d69f | 127 | |
e52775f4 JN |
128 | We can get this using the following command: |
129 | ||
b1889c36 | 130 | git rebase --onto master next topic |
e52775f4 JN |
131 | |
132 | ||
133 | Another example of --onto option is to rebase part of a | |
134 | branch. If we have the following situation: | |
135 | ||
136 | ------------ | |
137 | H---I---J topicB | |
138 | / | |
139 | E---F---G topicA | |
140 | / | |
141 | A---B---C---D master | |
142 | ------------ | |
143 | ||
144 | then the command | |
145 | ||
b1889c36 | 146 | git rebase --onto master topicA topicB |
e52775f4 JN |
147 | |
148 | would result in: | |
149 | ||
150 | ------------ | |
151 | H'--I'--J' topicB | |
152 | / | |
153 | | E---F---G topicA | |
154 | |/ | |
155 | A---B---C---D master | |
156 | ------------ | |
157 | ||
158 | This is useful when topicB does not depend on topicA. | |
159 | ||
ea81fcc5 SP |
160 | A range of commits could also be removed with rebase. If we have |
161 | the following situation: | |
162 | ||
163 | ------------ | |
164 | E---F---G---H---I---J topicA | |
165 | ------------ | |
166 | ||
167 | then the command | |
168 | ||
b1889c36 | 169 | git rebase --onto topicA~5 topicA~3 topicA |
ea81fcc5 SP |
170 | |
171 | would result in the removal of commits F and G: | |
172 | ||
173 | ------------ | |
174 | E---H'---I'---J' topicA | |
175 | ------------ | |
176 | ||
177 | This is useful if F and G were flawed in some way, or should not be | |
178 | part of topicA. Note that the argument to --onto and the <upstream> | |
179 | parameter can be any valid commit-ish. | |
180 | ||
0b444cdb TR |
181 | In case of conflict, 'git rebase' will stop at the first problematic commit |
182 | and leave conflict markers in the tree. You can use 'git diff' to locate | |
031321c6 | 183 | the markers (<<<<<<) and make edits to resolve the conflict. For each |
2de9b711 | 184 | file you edit, you need to tell Git that the conflict has been resolved, |
031321c6 SE |
185 | typically this would be done with |
186 | ||
187 | ||
d7f078b8 | 188 | git add <filename> |
031321c6 SE |
189 | |
190 | ||
191 | After resolving the conflict manually and updating the index with the | |
192 | desired resolution, you can continue the rebasing process with | |
193 | ||
194 | ||
195 | git rebase --continue | |
8978d043 | 196 | |
8978d043 | 197 | |
0b444cdb | 198 | Alternatively, you can undo the 'git rebase' with |
8978d043 | 199 | |
031321c6 SE |
200 | |
201 | git rebase --abort | |
8978d043 | 202 | |
a9c3821c TAV |
203 | CONFIGURATION |
204 | ------------- | |
205 | ||
206 | rebase.stat:: | |
207 | Whether to show a diffstat of what changed upstream since the last | |
208 | rebase. False by default. | |
209 | ||
dd1e5b31 HV |
210 | rebase.autosquash:: |
211 | If set to true enable '--autosquash' option by default. | |
212 | ||
58794775 RR |
213 | rebase.autostash:: |
214 | If set to true enable '--autostash' option by default. | |
215 | ||
7fc9d69f JH |
216 | OPTIONS |
217 | ------- | |
c2145384 | 218 | --onto <newbase>:: |
69a60af5 CW |
219 | Starting point at which to create the new commits. If the |
220 | --onto option is not specified, the starting point is | |
ea81fcc5 SP |
221 | <upstream>. May be any valid commit, and not just an |
222 | existing branch name. | |
873c3472 | 223 | + |
b9190e79 | 224 | As a special case, you may use "A\...B" as a shortcut for the |
873c3472 MG |
225 | merge base of A and B if there is exactly one merge base. You can |
226 | leave out at most one of A and B, in which case it defaults to HEAD. | |
69a60af5 | 227 | |
52a22d1e | 228 | <upstream>:: |
ea81fcc5 | 229 | Upstream branch to compare against. May be any valid commit, |
15a147e6 MZ |
230 | not just an existing branch name. Defaults to the configured |
231 | upstream for the current branch. | |
7fc9d69f | 232 | |
228382ae | 233 | <branch>:: |
52a22d1e | 234 | Working branch; defaults to HEAD. |
7fc9d69f | 235 | |
031321c6 SE |
236 | --continue:: |
237 | Restart the rebasing process after having resolved a merge conflict. | |
238 | ||
239 | --abort:: | |
5960bc9d MZ |
240 | Abort the rebase operation and reset HEAD to the original |
241 | branch. If <branch> was provided when the rebase operation was | |
242 | started, then HEAD will be reset to <branch>. Otherwise HEAD | |
243 | will be reset to where it was when the rebase operation was | |
244 | started. | |
031321c6 | 245 | |
90e1818f NH |
246 | --keep-empty:: |
247 | Keep the commits that do not change anything from its | |
248 | parents in the result. | |
249 | ||
58634dbf EW |
250 | --skip:: |
251 | Restart the rebasing process by skipping the current patch. | |
58634dbf | 252 | |
eb9a7cb4 AW |
253 | --edit-todo:: |
254 | Edit the todo list during an interactive rebase. | |
255 | ||
3240240f SB |
256 | -m:: |
257 | --merge:: | |
58634dbf EW |
258 | Use merging strategies to rebase. When the recursive (default) merge |
259 | strategy is used, this allows rebase to be aware of renames on the | |
260 | upstream side. | |
31ddd1ee TR |
261 | + |
262 | Note that a rebase merge works by replaying each commit from the working | |
263 | branch on top of the <upstream> branch. Because of this, when a merge | |
264 | conflict happens, the side reported as 'ours' is the so-far rebased | |
265 | series, starting with <upstream>, and 'theirs' is the working branch. In | |
266 | other words, the sides are swapped. | |
58634dbf | 267 | |
3240240f SB |
268 | -s <strategy>:: |
269 | --strategy=<strategy>:: | |
06f39190 | 270 | Use the given merge strategy. |
0b444cdb | 271 | If there is no `-s` option 'git merge-recursive' is used |
31ddd1ee TR |
272 | instead. This implies --merge. |
273 | + | |
0b444cdb | 274 | Because 'git rebase' replays each commit from the working branch |
31ddd1ee TR |
275 | on top of the <upstream> branch using the given strategy, using |
276 | the 'ours' strategy simply discards all patches from the <branch>, | |
277 | which makes little sense. | |
58634dbf | 278 | |
93ce190c ML |
279 | -X <strategy-option>:: |
280 | --strategy-option=<strategy-option>:: | |
281 | Pass the <strategy-option> through to the merge strategy. | |
6cf378f0 | 282 | This implies `--merge` and, if no strategy has been |
93ce190c | 283 | specified, `-s recursive`. Note the reversal of 'ours' and |
edfbbf7e | 284 | 'theirs' as noted above for the `-m` option. |
93ce190c | 285 | |
3ee5e540 NV |
286 | -S[<keyid>]:: |
287 | --gpg-sign[=<keyid>]:: | |
288 | GPG-sign commits. | |
289 | ||
0e987a12 SB |
290 | -q:: |
291 | --quiet:: | |
292 | Be quiet. Implies --no-stat. | |
293 | ||
3240240f SB |
294 | -v:: |
295 | --verbose:: | |
a9c3821c TAV |
296 | Be verbose. Implies --stat. |
297 | ||
298 | --stat:: | |
299 | Show a diffstat of what changed upstream since the last rebase. The | |
300 | diffstat is also controlled by the configuration option rebase.stat. | |
301 | ||
302 | -n:: | |
303 | --no-stat:: | |
304 | Do not show a diffstat as part of the rebase process. | |
b758789c | 305 | |
fd631d58 NS |
306 | --no-verify:: |
307 | This option bypasses the pre-rebase hook. See also linkgit:githooks[5]. | |
308 | ||
7baf9c4b MZ |
309 | --verify:: |
310 | Allows the pre-rebase hook to run, which is the default. This option can | |
311 | be used to override --no-verify. See also linkgit:githooks[5]. | |
312 | ||
67dad687 MT |
313 | -C<n>:: |
314 | Ensure at least <n> lines of surrounding context match before | |
315 | and after each change. When fewer lines of surrounding | |
316 | context exist they all must match. By default no context is | |
317 | ever ignored. | |
318 | ||
5e75d56f MB |
319 | -f:: |
320 | --force-rebase:: | |
2d26d533 SO |
321 | Force a rebase even if the current branch is up-to-date and |
322 | the command without `--force` would return without doing anything. | |
b4995494 MB |
323 | + |
324 | You may find this (or --no-ff with an interactive rebase) helpful after | |
325 | reverting a topic branch merge, as this option recreates the topic branch with | |
326 | fresh commits so it can be remerged successfully without needing to "revert | |
327 | the reversion" (see the | |
d5ff3b4b | 328 | link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details). |
5e75d56f | 329 | |
ad8261d2 JK |
330 | --fork-point:: |
331 | --no-fork-point:: | |
f51a48ec SO |
332 | Use reflog to find a better common ancestor between <upstream> |
333 | and <branch> when calculating which commits have been | |
334 | introduced by <branch>. | |
ad8261d2 | 335 | + |
f51a48ec SO |
336 | When --fork-point is active, 'fork_point' will be used instead of |
337 | <upstream> to calculate the set of commits to rebase, where | |
338 | 'fork_point' is the result of `git merge-base --fork-point <upstream> | |
339 | <branch>` command (see linkgit:git-merge-base[1]). If 'fork_point' | |
340 | ends up being empty, the <upstream> will be used as a fallback. | |
341 | + | |
342 | If either <upstream> or --root is given on the command line, then the | |
343 | default is `--no-fork-point`, otherwise the default is `--fork-point`. | |
ad8261d2 | 344 | |
86c91f91 | 345 | --ignore-whitespace:: |
749485f6 | 346 | --whitespace=<option>:: |
0b444cdb | 347 | These flag are passed to the 'git apply' program |
5162e697 | 348 | (see linkgit:git-apply[1]) that applies the patch. |
7fe54385 | 349 | Incompatible with the --interactive option. |
059f446d | 350 | |
570ccad3 MB |
351 | --committer-date-is-author-date:: |
352 | --ignore-date:: | |
0b444cdb | 353 | These flags are passed to 'git am' to easily change the dates |
570ccad3 | 354 | of the rebased commits (see linkgit:git-am[1]). |
56a05720 | 355 | Incompatible with the --interactive option. |
570ccad3 | 356 | |
3240240f SB |
357 | -i:: |
358 | --interactive:: | |
1b1dce4b | 359 | Make a list of the commits which are about to be rebased. Let the |
f0fd889d JS |
360 | user edit that list before rebasing. This mode can also be used to |
361 | split commits (see SPLITTING COMMITS below). | |
1b1dce4b | 362 | |
3240240f SB |
363 | -p:: |
364 | --preserve-merges:: | |
f8cca019 | 365 | Instead of ignoring merges, try to recreate them. |
cddb42d2 JN |
366 | + |
367 | This uses the `--interactive` machinery internally, but combining it | |
368 | with the `--interactive` option explicitly is generally not a good | |
369 | idea unless you know what you are doing (see BUGS below). | |
370 | ||
c2145384 LK |
371 | -x <cmd>:: |
372 | --exec <cmd>:: | |
373 | Append "exec <cmd>" after each line creating a commit in the | |
374 | final history. <cmd> will be interpreted as one or more shell | |
375 | commands. | |
376 | + | |
377 | This option can only be used with the `--interactive` option | |
378 | (see INTERACTIVE MODE below). | |
379 | + | |
380 | You may execute several commands by either using one instance of `--exec` | |
381 | with several commands: | |
382 | + | |
383 | git rebase -i --exec "cmd1 && cmd2 && ..." | |
384 | + | |
385 | or by giving more than one `--exec`: | |
386 | + | |
387 | git rebase -i --exec "cmd1" --exec "cmd2" --exec ... | |
388 | + | |
389 | If `--autosquash` is used, "exec" lines will not be appended for | |
390 | the intermediate commits, and will only appear at the end of each | |
391 | squash/fixup series. | |
f09c9b8c | 392 | |
be496621 TR |
393 | --root:: |
394 | Rebase all commits reachable from <branch>, instead of | |
395 | limiting them with an <upstream>. This allows you to rebase | |
df5df20c | 396 | the root commit(s) on a branch. When used with --onto, it |
be496621 | 397 | will skip changes already contained in <newbase> (instead of |
df5df20c CW |
398 | <upstream>) whereas without --onto it will operate on every change. |
399 | When used together with both --onto and --preserve-merges, | |
400 | 'all' root commits will be rewritten to have <newbase> as parent | |
be496621 TR |
401 | instead. |
402 | ||
f59baa50 | 403 | --autosquash:: |
dd1e5b31 | 404 | --no-autosquash:: |
f59baa50 NS |
405 | When the commit log message begins with "squash! ..." (or |
406 | "fixup! ..."), and there is a commit whose title begins with | |
407 | the same ..., automatically modify the todo list of rebase -i | |
42cfcd20 | 408 | so that the commit marked for squashing comes right after the |
f59baa50 | 409 | commit to be modified, and change the action of the moved |
22c5b136 AP |
410 | commit from `pick` to `squash` (or `fixup`). Ignores subsequent |
411 | "fixup! " or "squash! " after the first, in case you referred to an | |
412 | earlier fixup/squash with `git commit --fixup/--squash`. | |
f59baa50 | 413 | + |
b4995494 | 414 | This option is only valid when the '--interactive' option is used. |
dd1e5b31 HV |
415 | + |
416 | If the '--autosquash' option is enabled by default using the | |
417 | configuration variable `rebase.autosquash`, this option can be | |
418 | used to override and disable this setting. | |
b4995494 | 419 | |
58794775 RR |
420 | --[no-]autostash:: |
421 | Automatically create a temporary stash before the operation | |
422 | begins, and apply it after the operation ends. This means | |
423 | that you can run rebase on a dirty worktree. However, use | |
424 | with care: the final stash application after a successful | |
425 | rebase might result in non-trivial conflicts. | |
426 | ||
b4995494 MB |
427 | --no-ff:: |
428 | With --interactive, cherry-pick all rebased commits instead of | |
429 | fast-forwarding over the unchanged ones. This ensures that the | |
430 | entire history of the rebased branch is composed of new commits. | |
431 | + | |
432 | Without --interactive, this is a synonym for --force-rebase. | |
433 | + | |
434 | You may find this helpful after reverting a topic branch merge, as this option | |
435 | recreates the topic branch with fresh commits so it can be remerged | |
436 | successfully without needing to "revert the reversion" (see the | |
d5ff3b4b | 437 | link:howto/revert-a-faulty-merge.html[revert-a-faulty-merge How-To] for details). |
f59baa50 | 438 | |
58634dbf EW |
439 | include::merge-strategies.txt[] |
440 | ||
031321c6 SE |
441 | NOTES |
442 | ----- | |
90d1c08e | 443 | |
0b444cdb | 444 | You should understand the implications of using 'git rebase' on a |
90d1c08e TR |
445 | repository that you share. See also RECOVERING FROM UPSTREAM REBASE |
446 | below. | |
031321c6 | 447 | |
467c0197 | 448 | When the git-rebase command is run, it will first execute a "pre-rebase" |
031321c6 SE |
449 | hook if one exists. You can use this hook to do sanity checks and |
450 | reject the rebase if it isn't appropriate. Please see the template | |
451 | pre-rebase hook script for an example. | |
452 | ||
702088af | 453 | Upon completion, <branch> will be the current branch. |
031321c6 | 454 | |
1b1dce4b JS |
455 | INTERACTIVE MODE |
456 | ---------------- | |
457 | ||
458 | Rebasing interactively means that you have a chance to edit the commits | |
459 | which are rebased. You can reorder the commits, and you can | |
460 | remove them (weeding out bad or otherwise unwanted patches). | |
461 | ||
462 | The interactive mode is meant for this type of workflow: | |
463 | ||
464 | 1. have a wonderful idea | |
465 | 2. hack on the code | |
466 | 3. prepare a series for submission | |
467 | 4. submit | |
468 | ||
469 | where point 2. consists of several instances of | |
470 | ||
d3f2475c NBL |
471 | a) regular use |
472 | ||
1b1dce4b JS |
473 | 1. finish something worthy of a commit |
474 | 2. commit | |
d3f2475c NBL |
475 | |
476 | b) independent fixup | |
477 | ||
1b1dce4b JS |
478 | 1. realize that something does not work |
479 | 2. fix that | |
480 | 3. commit it | |
481 | ||
482 | Sometimes the thing fixed in b.2. cannot be amended to the not-quite | |
483 | perfect commit it fixes, because that commit is buried deeply in a | |
484 | patch series. That is exactly what interactive rebase is for: use it | |
485 | after plenty of "a"s and "b"s, by rearranging and editing | |
486 | commits, and squashing multiple commits into one. | |
487 | ||
488 | Start it with the last commit you want to retain as-is: | |
489 | ||
490 | git rebase -i <after-this-commit> | |
491 | ||
492 | An editor will be fired up with all the commits in your current branch | |
493 | (ignoring merge commits), which come after the given commit. You can | |
494 | reorder the commits in this list to your heart's content, and you can | |
495 | remove them. The list looks more or less like this: | |
496 | ||
497 | ------------------------------------------- | |
498 | pick deadbee The oneline of this commit | |
499 | pick fa1afe1 The oneline of the next commit | |
500 | ... | |
501 | ------------------------------------------- | |
502 | ||
0b444cdb | 503 | The oneline descriptions are purely for your pleasure; 'git rebase' will |
1b1dce4b JS |
504 | not look at them but at the commit names ("deadbee" and "fa1afe1" in this |
505 | example), so do not delete or edit the names. | |
506 | ||
507 | By replacing the command "pick" with the command "edit", you can tell | |
0b444cdb | 508 | 'git rebase' to stop after applying that commit, so that you can edit |
1b1dce4b JS |
509 | the files and/or the commit message, amend the commit, and continue |
510 | rebasing. | |
511 | ||
6741aa6c BG |
512 | If you just want to edit the commit message for a commit, replace the |
513 | command "pick" with the command "reword". | |
514 | ||
1b1dce4b | 515 | If you want to fold two or more commits into one, replace the command |
0205e72f MH |
516 | "pick" for the second and subsequent commits with "squash" or "fixup". |
517 | If the commits had different authors, the folded commit will be | |
518 | attributed to the author of the first commit. The suggested commit | |
519 | message for the folded commit is the concatenation of the commit | |
520 | messages of the first commit and of those with the "squash" command, | |
521 | but omits the commit messages of commits with the "fixup" command. | |
1b1dce4b | 522 | |
0b444cdb | 523 | 'git rebase' will stop when "pick" has been replaced with "edit" or |
6741aa6c BG |
524 | when a command fails due to merge errors. When you are done editing |
525 | and/or resolving conflicts you can continue with `git rebase --continue`. | |
1b1dce4b JS |
526 | |
527 | For example, if you want to reorder the last 5 commits, such that what | |
528 | was HEAD~4 becomes the new HEAD. To achieve that, you would call | |
0b444cdb | 529 | 'git rebase' like this: |
1b1dce4b JS |
530 | |
531 | ---------------------- | |
532 | $ git rebase -i HEAD~5 | |
533 | ---------------------- | |
534 | ||
535 | And move the first patch to the end of the list. | |
536 | ||
f09c9b8c JS |
537 | You might want to preserve merges, if you have a history like this: |
538 | ||
539 | ------------------ | |
540 | X | |
541 | \ | |
542 | A---M---B | |
543 | / | |
544 | ---o---O---P---Q | |
545 | ------------------ | |
546 | ||
547 | Suppose you want to rebase the side branch starting at "A" to "Q". Make | |
548 | sure that the current HEAD is "B", and call | |
549 | ||
550 | ----------------------------- | |
551 | $ git rebase -i -p --onto Q O | |
552 | ----------------------------- | |
553 | ||
cd035b1c MM |
554 | Reordering and editing commits usually creates untested intermediate |
555 | steps. You may want to check that your history editing did not break | |
556 | anything by running a test, or at least recompiling at intermediate | |
557 | points in history by using the "exec" command (shortcut "x"). You may | |
558 | do so by creating a todo list like this one: | |
559 | ||
560 | ------------------------------------------- | |
561 | pick deadbee Implement feature XXX | |
562 | fixup f1a5c00 Fix to feature XXX | |
563 | exec make | |
564 | pick c0ffeee The oneline of the next commit | |
565 | edit deadbab The oneline of the commit after | |
566 | exec cd subdir; make test | |
567 | ... | |
568 | ------------------------------------------- | |
569 | ||
570 | The interactive rebase will stop when a command fails (i.e. exits with | |
571 | non-0 status) to give you an opportunity to fix the problem. You can | |
572 | continue with `git rebase --continue`. | |
573 | ||
574 | The "exec" command launches the command in a shell (the one specified | |
575 | in `$SHELL`, or the default shell if `$SHELL` is not set), so you can | |
576 | use shell features (like "cd", ">", ";" ...). The command is run from | |
577 | the root of the working tree. | |
f0fd889d | 578 | |
c2145384 LK |
579 | ---------------------------------- |
580 | $ git rebase -i --exec "make test" | |
581 | ---------------------------------- | |
582 | ||
583 | This command lets you check that intermediate commits are compilable. | |
584 | The todo list becomes like that: | |
585 | ||
586 | -------------------- | |
587 | pick 5928aea one | |
588 | exec make test | |
589 | pick 04d0fda two | |
590 | exec make test | |
591 | pick ba46169 three | |
592 | exec make test | |
593 | pick f4593f9 four | |
594 | exec make test | |
595 | -------------------- | |
596 | ||
f0fd889d JS |
597 | SPLITTING COMMITS |
598 | ----------------- | |
599 | ||
600 | In interactive mode, you can mark commits with the action "edit". However, | |
0b444cdb | 601 | this does not necessarily mean that 'git rebase' expects the result of this |
f0fd889d JS |
602 | edit to be exactly one commit. Indeed, you can undo the commit, or you can |
603 | add other commits. This can be used to split a commit into two: | |
604 | ||
483bc4f0 | 605 | - Start an interactive rebase with `git rebase -i <commit>^`, where |
f0fd889d JS |
606 | <commit> is the commit you want to split. In fact, any commit range |
607 | will do, as long as it contains that commit. | |
608 | ||
609 | - Mark the commit you want to split with the action "edit". | |
610 | ||
483bc4f0 | 611 | - When it comes to editing that commit, execute `git reset HEAD^`. The |
f0fd889d JS |
612 | effect is that the HEAD is rewound by one, and the index follows suit. |
613 | However, the working tree stays the same. | |
614 | ||
615 | - Now add the changes to the index that you want to have in the first | |
483bc4f0 | 616 | commit. You can use `git add` (possibly interactively) or |
0b444cdb | 617 | 'git gui' (or both) to do that. |
f0fd889d JS |
618 | |
619 | - Commit the now-current index with whatever commit message is appropriate | |
620 | now. | |
621 | ||
622 | - Repeat the last two steps until your working tree is clean. | |
623 | ||
483bc4f0 | 624 | - Continue the rebase with `git rebase --continue`. |
f0fd889d JS |
625 | |
626 | If you are not absolutely sure that the intermediate revisions are | |
627 | consistent (they compile, pass the testsuite, etc.) you should use | |
0b444cdb | 628 | 'git stash' to stash away the not-yet-committed changes |
f0fd889d JS |
629 | after each commit, test, and amend the commit if fixes are necessary. |
630 | ||
631 | ||
90d1c08e TR |
632 | RECOVERING FROM UPSTREAM REBASE |
633 | ------------------------------- | |
634 | ||
635 | Rebasing (or any other form of rewriting) a branch that others have | |
636 | based work on is a bad idea: anyone downstream of it is forced to | |
637 | manually fix their history. This section explains how to do the fix | |
638 | from the downstream's point of view. The real fix, however, would be | |
639 | to avoid rebasing the upstream in the first place. | |
640 | ||
641 | To illustrate, suppose you are in a situation where someone develops a | |
642 | 'subsystem' branch, and you are working on a 'topic' that is dependent | |
643 | on this 'subsystem'. You might end up with a history like the | |
644 | following: | |
645 | ||
646 | ------------ | |
647 | o---o---o---o---o---o---o---o---o master | |
648 | \ | |
649 | o---o---o---o---o subsystem | |
650 | \ | |
651 | *---*---* topic | |
652 | ------------ | |
653 | ||
654 | If 'subsystem' is rebased against 'master', the following happens: | |
655 | ||
656 | ------------ | |
657 | o---o---o---o---o---o---o---o master | |
658 | \ \ | |
659 | o---o---o---o---o o'--o'--o'--o'--o' subsystem | |
660 | \ | |
661 | *---*---* topic | |
662 | ------------ | |
663 | ||
664 | If you now continue development as usual, and eventually merge 'topic' | |
665 | to 'subsystem', the commits from 'subsystem' will remain duplicated forever: | |
666 | ||
667 | ------------ | |
668 | o---o---o---o---o---o---o---o master | |
669 | \ \ | |
670 | o---o---o---o---o o'--o'--o'--o'--o'--M subsystem | |
671 | \ / | |
672 | *---*---*-..........-*--* topic | |
673 | ------------ | |
674 | ||
675 | Such duplicates are generally frowned upon because they clutter up | |
676 | history, making it harder to follow. To clean things up, you need to | |
677 | transplant the commits on 'topic' to the new 'subsystem' tip, i.e., | |
678 | rebase 'topic'. This becomes a ripple effect: anyone downstream from | |
679 | 'topic' is forced to rebase too, and so on! | |
680 | ||
681 | There are two kinds of fixes, discussed in the following subsections: | |
682 | ||
683 | Easy case: The changes are literally the same.:: | |
684 | ||
685 | This happens if the 'subsystem' rebase was a simple rebase and | |
686 | had no conflicts. | |
687 | ||
688 | Hard case: The changes are not the same.:: | |
689 | ||
690 | This happens if the 'subsystem' rebase had conflicts, or used | |
6cf378f0 JK |
691 | `--interactive` to omit, edit, squash, or fixup commits; or |
692 | if the upstream used one of `commit --amend`, `reset`, or | |
90d1c08e TR |
693 | `filter-branch`. |
694 | ||
695 | ||
696 | The easy case | |
697 | ~~~~~~~~~~~~~ | |
698 | ||
699 | Only works if the changes (patch IDs based on the diff contents) on | |
700 | 'subsystem' are literally the same before and after the rebase | |
701 | 'subsystem' did. | |
702 | ||
0b444cdb | 703 | In that case, the fix is easy because 'git rebase' knows to skip |
90d1c08e TR |
704 | changes that are already present in the new upstream. So if you say |
705 | (assuming you're on 'topic') | |
706 | ------------ | |
707 | $ git rebase subsystem | |
708 | ------------ | |
709 | you will end up with the fixed history | |
710 | ------------ | |
711 | o---o---o---o---o---o---o---o master | |
712 | \ | |
713 | o'--o'--o'--o'--o' subsystem | |
714 | \ | |
715 | *---*---* topic | |
716 | ------------ | |
717 | ||
718 | ||
719 | The hard case | |
720 | ~~~~~~~~~~~~~ | |
721 | ||
722 | Things get more complicated if the 'subsystem' changes do not exactly | |
723 | correspond to the ones before the rebase. | |
724 | ||
725 | NOTE: While an "easy case recovery" sometimes appears to be successful | |
726 | even in the hard case, it may have unintended consequences. For | |
727 | example, a commit that was removed via `git rebase | |
6cf378f0 | 728 | --interactive` will be **resurrected**! |
90d1c08e | 729 | |
0b444cdb | 730 | The idea is to manually tell 'git rebase' "where the old 'subsystem' |
90d1c08e TR |
731 | ended and your 'topic' began", that is, what the old merge-base |
732 | between them was. You will have to find a way to name the last commit | |
733 | of the old 'subsystem', for example: | |
734 | ||
0b444cdb | 735 | * With the 'subsystem' reflog: after 'git fetch', the old tip of |
6cf378f0 | 736 | 'subsystem' is at `subsystem@{1}`. Subsequent fetches will |
90d1c08e TR |
737 | increase the number. (See linkgit:git-reflog[1].) |
738 | ||
739 | * Relative to the tip of 'topic': knowing that your 'topic' has three | |
740 | commits, the old tip of 'subsystem' must be `topic~3`. | |
741 | ||
742 | You can then transplant the old `subsystem..topic` to the new tip by | |
743 | saying (for the reflog case, and assuming you are on 'topic' already): | |
744 | ------------ | |
745 | $ git rebase --onto subsystem subsystem@{1} | |
746 | ------------ | |
747 | ||
748 | The ripple effect of a "hard case" recovery is especially bad: | |
749 | 'everyone' downstream from 'topic' will now have to perform a "hard | |
750 | case" recovery too! | |
751 | ||
cddb42d2 JN |
752 | BUGS |
753 | ---- | |
754 | The todo list presented by `--preserve-merges --interactive` does not | |
755 | represent the topology of the revision graph. Editing commits and | |
756 | rewording their commit messages should work fine, but attempts to | |
757 | reorder commits tend to produce counterintuitive results. | |
758 | ||
759 | For example, an attempt to rearrange | |
760 | ------------ | |
761 | 1 --- 2 --- 3 --- 4 --- 5 | |
762 | ------------ | |
763 | to | |
764 | ------------ | |
765 | 1 --- 2 --- 4 --- 3 --- 5 | |
766 | ------------ | |
767 | by moving the "pick 4" line will result in the following history: | |
768 | ------------ | |
769 | 3 | |
770 | / | |
771 | 1 --- 2 --- 4 --- 5 | |
772 | ------------ | |
773 | ||
7fc9d69f JH |
774 | GIT |
775 | --- | |
9e1f0a85 | 776 | Part of the linkgit:git[1] suite |