Skip to content

Instantly share code, notes, and snippets.

@cholmboe

cholmboe/merging-end

Last active August 29, 2015 13:57
Show Gist options
  • Save cholmboe/9351403 to your computer and use it in GitHub Desktop.
Save cholmboe/9351403 to your computer and use it in GitHub Desktop.
Download ZIP
Git talk
Raw
merging-end
{
"branches": {
"master": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C8",
"id": "master",
"type": "branch"
},
"feature1": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C4",
"id": "feature1",
"type": "branch"
}
},
"commits": {
"C0": {
"type": "commit",
"parents": [],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:03:12 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C0",
"rootCommit": true
},
"C1": {
"type": "commit",
"parents": [
"C0"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:03:12 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C1"
},
"C2": {
"type": "commit",
"parents": [
"C1"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:04:16 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C2"
},
"C3": {
"type": "commit",
"parents": [
"C2"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:06:51 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C3"
},
"C4": {
"type": "commit",
"parents": [
"C3"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:06:55 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C4"
},
"C5": {
"type": "commit",
"parents": [
"C2"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:07:05 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C5"
},
"C6": {
"type": "commit",
"parents": [
"C5"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:07:09 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C6"
},
"C7": {
"type": "commit",
"parents": [
"C6",
"C4"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:11:28 GMT+0100 (CET)",
"commitMessage": "Merge branch \"feature1\" into branch \"master\"",
"id": "C7"
},
"C8": {
"type": "commit",
"parents": [
"C7"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:11:51 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C8"
}
},
"tags": {},
"HEAD": {
"id": "HEAD",
"target": "master",
"type": "general ref"
}
}
Raw
merging-start
{
"branches": {
"master": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C6",
"id": "master",
"type": "branch"
},
"feature1": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C4",
"id": "feature1",
"type": "branch"
}
},
"commits": {
"C0": {
"type": "commit",
"parents": [],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:03:12 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C0",
"rootCommit": true
},
"C1": {
"type": "commit",
"parents": [
"C0"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:03:12 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C1"
},
"C2": {
"type": "commit",
"parents": [
"C1"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:04:16 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C2"
},
"C3": {
"type": "commit",
"parents": [
"C2"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:06:51 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C3"
},
"C4": {
"type": "commit",
"parents": [
"C3"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:06:55 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C4"
},
"C5": {
"type": "commit",
"parents": [
"C2"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:07:05 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C5"
},
"C6": {
"type": "commit",
"parents": [
"C5"
],
"author": "Peter Cottle",
"createTime": "Wed Mar 05 2014 16:07:09 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C6"
}
},
"tags": {},
"HEAD": {
"id": "HEAD",
"target": "master",
"type": "general ref"
}
}
Raw
remotes-pre-fetch
{
"branches": {
"master": {
"remoteTrackingBranchID": "o/master",
"remote": false,
"target": "C3",
"id": "master",
"type": "branch"
},
"o/master": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C1",
"id": "o/master",
"type": "branch"
}
},
"commits": {
"C0": {
"type": "commit",
"parents": [],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C0",
"rootCommit": true
},
"C1": {
"type": "commit",
"parents": [
"C0"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C1"
},
"C2": {
"type": "commit",
"parents": [
"C1"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:28:51 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C2"
},
"C3": {
"type": "commit",
"parents": [
"C2"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:28:53 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C3"
}
},
"tags": {},
"HEAD": {
"target": "master",
"id": "HEAD",
"type": "general ref"
},
"originTree": {
"branches": {
"master": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C5",
"id": "master",
"type": "branch"
}
},
"commits": {
"C0": {
"type": "commit",
"parents": [],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C0",
"rootCommit": true
},
"C1": {
"type": "commit",
"parents": [
"C0"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C1"
},
"C4": {
"type": "commit",
"parents": [
"C1"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:29:04 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C4"
},
"C5": {
"type": "commit",
"parents": [
"C4"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:29:07 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C5"
}
},
"tags": {},
"HEAD": {
"target": "master",
"id": "HEAD",
"type": "general ref"
}
}
}
Raw
remotes-start
{
"branches": {
"master": {
"remoteTrackingBranchID": "o/master",
"remote": false,
"target": "C1",
"id": "master",
"type": "branch"
},
"o/master": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C1",
"id": "o/master",
"type": "branch"
}
},
"commits": {
"C0": {
"type": "commit",
"parents": [],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C0",
"rootCommit": true
},
"C1": {
"type": "commit",
"parents": [
"C0"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C1"
}
},
"tags": {},
"HEAD": {
"target": "master",
"id": "HEAD",
"type": "general ref"
},
"originTree": {
"branches": {
"master": {
"remoteTrackingBranchID": null,
"remote": false,
"target": "C1",
"id": "master",
"type": "branch"
}
},
"commits": {
"C0": {
"type": "commit",
"parents": [],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C0",
"rootCommit": true
},
"C1": {
"type": "commit",
"parents": [
"C0"
],
"author": "Peter Cottle",
"createTime": "Thu Mar 06 2014 15:27:06 GMT+0100 (CET)",
"commitMessage": "Quick commit. Go Bears!",
"id": "C1"
}
},
"tags": {},
"HEAD": {
"target": "master",
"id": "HEAD",
"type": "general ref"
}
}
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment