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