File size: 2,803 Bytes
077605d | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 | {
"title": "Pro Git: Basic Branching and Merging",
"sources": [
{
"url": "https://git-scm.com/book/en/v2/images/basic-branching-4.png",
"file": "assets/basic-branching-4.png",
"alt": "Hotfix branch based on `master`",
"retrieved_at": "2026-10-26T17:13:35.680410+00:00",
"downloaded": true,
"bytes": 55321,
"sha256": "625c2a96cadff819676c0027292e261d04e1a59631a3557c5214d25cbd0e8327"
},
{
"url": "https://git-scm.com/book/en/v2/images/basic-branching-5.png",
"file": "assets/basic-branching-5.png",
"alt": "`master` is fast-forwarded to `hotfix`",
"retrieved_at": "2026-10-26T17:13:36.511149+00:00",
"downloaded": true,
"bytes": 59883,
"sha256": "333ca1f1949b8b0f9c09cd59803fdb5383790e2e6463d5151175aa16ae2f83df"
},
{
"url": "https://git-scm.com/book/en/v2/images/basic-branching-6.png",
"file": "assets/basic-branching-6.png",
"alt": "Work continues on `iss53`",
"retrieved_at": "2026-10-26T17:13:36.525440+00:00",
"downloaded": true,
"bytes": 64690,
"sha256": "cad6c7ee9e7dea004f03a297e186b60a32581ae1148f1e06277a1f53d4fa7dd4"
},
{
"url": "https://git-scm.com/book/en/v2/images/basic-merging-1.png",
"file": "assets/basic-merging-1.png",
"alt": "Three snapshots used in a typical merge",
"retrieved_at": "2026-10-26T17:13:36.633530+00:00",
"downloaded": true,
"bytes": 96875,
"sha256": "cbf9851807d9f3be823dccf5edeb1e0d5d6a917fe3a6280df3531665fbfe1c16"
},
{
"url": "https://git-scm.com/book/en/v2/images/basic-merging-2.png",
"file": "assets/basic-merging-2.png",
"alt": "A merge commit",
"retrieved_at": "2026-10-26T17:13:37.103187+00:00",
"downloaded": true,
"bytes": 14523,
"sha256": "fea56bea4d8ff7f47aea2f3b38fc62812cb0a809bbbf0cd5a3260b93397f9f21"
},
{
"url": "https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging",
"file": "branching-merging.html",
"retrieved_at": "2026-10-26T17:12:48.563245+00:00",
"content_type": "text/html; charset=utf-8",
"resolved_url": "https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging",
"downloaded": true,
"bytes": 139702,
"sha256": "35fb4188f1da8fea4611944453351253d9b1b988fe61476ad3ecad762299276f"
}
],
"derived_texts": [
{
"path": "branching-merging.txt",
"bytes": 14730,
"sha256": "9dc8531ea1195ce002f03656c9558283dd19fb9b0e21116653691dae36a82a19"
}
],
"offline_note": "Chapter HTML/text and five selected original commit diagrams supplied; other site assets are not required.",
"rights_status": "Preserve source attribution. Combined-package redistribution not cleared."
}
|