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