-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(api): include content to be served from gh-pages
1 parent
dc3cc31
commit 9914155
Showing
58 changed files
with
234 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
{"nodes":[{"type":"blob","id":"05a8da24ba96d54811f7ea93d527968e2dee3c41"},{"type":"commit","id":"07870fcf1cae67fcee108e7e0bac81a4c69842d0"},{"type":"tree","id":"09184c94ef2a8398af0121ab186bedead1d876d2"},{"type":"commit","id":"0cb5cf41bf6b2103b803b24c1f819864b626df45"},{"type":"commit","id":"137079caa44182e93f862b7f749406e8bc964d68"},{"type":"blob","id":"19281599c06330d9a114e9362b41c751e67e3e72"},{"type":"tree","id":"1e98398fa3fb070cd23563cb6b84d81161e72439"},{"type":"commit","id":"250d4d2e39ffdc3f8cdbb3a064b8d53cf1cae85b"},{"type":"tree","id":"289ba8713973d26dfbee003cb14fbcc0b1cc2e9e"},{"type":"commit","id":"2af1aa0b6cb5edcb656503c2d3cf4e53938b48a8"},{"type":"blob","id":"31047d0a3b53bb4d8fba079e81c8f9bc04882b49"},{"type":"tree","id":"3ce06b54ba2f22a5e9bbb4a9cf370442d3e5a2b8"},{"type":"commit","id":"408a3337cc79ba20939e223697fb6276628992a4"},{"type":"tree","id":"4fa306410072f83abafae52fc6ac05aae3bed77c"},{"type":"commit","id":"5b4ddc33ef3da7a248025cc228bc9ef7e860740a"},{"type":"commit","id":"5ec56758dd6d1e29baff78b1bedaa76b91218eb8"},{"type":"blob","id":"639762b86c4d2e07cfc65c37c811f936b2276975"},{"type":"tree","id":"6c9b93b06061698779ec27237a8e1850e67cc974"},{"type":"commit","id":"6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8"},{"type":"commit","id":"6ec94c2e114d1bceda3402fff155d64b3a52ebba"},{"type":"blob","id":"8d9546febb4b105413c7616dc6f02de24cb70b1f"},{"type":"tree","id":"8f9744b21e618396b12b26688b44678f3171f40d"},{"type":"commit","id":"94d916abee747e969b7dc3236fbbfb3246086edb"},{"type":"commit","id":"9687993785b9a18a2544c6bcc971fcd613f90733"},{"type":"tree","id":"9a96926442f477a2b03ae06cfffcab8393748218"},{"type":"tree","id":"9e174571aa0d537ba37cee04048d87a4e27b4102"},{"type":"tree","id":"a068b7d3bdda0b6d79d900b7a131ad23aa30f5a4"},{"type":"blob","id":"a49fd0b60e3088086fe659ec08a1ce63dc669f6f"},{"type":"blob","id":"ab01d92a0b4becd1bfc8a423a0a5956f88113980"},{"type":"blob","id":"ab54f89a11394e63d69de7a0d4f7c81604e7d2d1"},{"type":"blob","id":"b68cb9cd5a5fb031bb2be01dd9d4592e7025add3"},{"type":"tree","id":"c5f5272c0be702b3457d6b86df1edb15049d7d60"},{"type":"blob","id":"c7d51a90750c8d9f217162789317b9bd59738097"},{"type":"commit","id":"ca6ebd6b7e0565498fed6e4eafac68913f586b14"},{"type":"blob","id":"cfbe5906762cc89f63dade27e9bce46a8843f0b1"},{"type":"blob","id":"d289fd405e698899c0b447139b8655f3d1e81114"},{"type":"blob","id":"d60afbdf581430b780b6184be95375aa1dedc34b"},{"type":"blob","id":"d8a9df2fd10462aa233641cbd4adaa68a50359b8"},{"type":"tree","id":"db81081014be4ef7103e77061d4482b365433b0b"},{"type":"tree","id":"dd57f23e5c5e996ef9ed00464e164da3926e3acd"},{"type":"tree","id":"e7d8b02bdda51a6101ba2cc3329b5e9bcf96bdf1"},{"type":"tree","id":"eac548ea0e79130d7b604fcff22b7bd7f210c9aa"},{"type":"blob","id":"f07c09068550591ffd7efda7814ec1dfda4a0da8"},{"type":"commit","id":"f2aee1c1286747e66ac39bf707dca5ec8db4cd2c"},{"type":"blob","id":"f4d35e47d8a1dd5957a151e0f0451432b02430b3"},{"type":"blob","id":"f4e0fc68fae253008d2385e7a7ba22da6729240d"},{"type":"commit","id":"fd3fb192a472fceed3c90b1a280f28fccec73472"},{"type":"head","id":"master"},{"type":"head","id":"my-feature"},{"type":"head","id":"my-other-branch"},{"type":"head","id":"rebase-demo"},{"type":"head","id":"simple-merge"},{"type":"remote","id":"azure-devops/master"},{"type":"remote","id":"github/master"},{"type":"tag","id":"R0.1"},{"type":"HEAD","id":"HEAD"}],"edges":[{"from":"07870fcf1cae67fcee108e7e0bac81a4c69842d0","to":"1e98398fa3fb070cd23563cb6b84d81161e72439"},{"from":"07870fcf1cae67fcee108e7e0bac81a4c69842d0","to":"ca6ebd6b7e0565498fed6e4eafac68913f586b14"},{"from":"09184c94ef2a8398af0121ab186bedead1d876d2","to":"a49fd0b60e3088086fe659ec08a1ce63dc669f6f"},{"from":"09184c94ef2a8398af0121ab186bedead1d876d2","to":"b68cb9cd5a5fb031bb2be01dd9d4592e7025add3"},{"from":"0cb5cf41bf6b2103b803b24c1f819864b626df45","to":"c5f5272c0be702b3457d6b86df1edb15049d7d60"},{"from":"0cb5cf41bf6b2103b803b24c1f819864b626df45","to":"07870fcf1cae67fcee108e7e0bac81a4c69842d0"},{"from":"137079caa44182e93f862b7f749406e8bc964d68","to":"8f9744b21e618396b12b26688b44678f3171f40d"},{"from":"137079caa44182e93f862b7f749406e8bc964d68","to":"6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8"},{"from":"137079caa44182e93f862b7f749406e8bc964d68","to":"07870fcf1cae67fcee108e7e0bac81a4c69842d0"},{"from":"1e98398fa3fb070cd23563cb6b84d81161e72439","to":"ab01d92a0b4becd1bfc8a423a0a5956f88113980"},{"from":"1e98398fa3fb070cd23563cb6b84d81161e72439","to":"639762b86c4d2e07cfc65c37c811f936b2276975"},{"from":"250d4d2e39ffdc3f8cdbb3a064b8d53cf1cae85b","to":"db81081014be4ef7103e77061d4482b365433b0b"},{"from":"250d4d2e39ffdc3f8cdbb3a064b8d53cf1cae85b","to":"5ec56758dd6d1e29baff78b1bedaa76b91218eb8"},{"from":"289ba8713973d26dfbee003cb14fbcc0b1cc2e9e","to":"639762b86c4d2e07cfc65c37c811f936b2276975"},{"from":"2af1aa0b6cb5edcb656503c2d3cf4e53938b48a8","to":"a068b7d3bdda0b6d79d900b7a131ad23aa30f5a4"},{"from":"3ce06b54ba2f22a5e9bbb4a9cf370442d3e5a2b8","to":"ab01d92a0b4becd1bfc8a423a0a5956f88113980"},{"from":"3ce06b54ba2f22a5e9bbb4a9cf370442d3e5a2b8","to":"31047d0a3b53bb4d8fba079e81c8f9bc04882b49"},{"from":"408a3337cc79ba20939e223697fb6276628992a4","to":"09184c94ef2a8398af0121ab186bedead1d876d2"},{"from":"408a3337cc79ba20939e223697fb6276628992a4","to":"5ec56758dd6d1e29baff78b1bedaa76b91218eb8"},{"from":"4fa306410072f83abafae52fc6ac05aae3bed77c","to":"cfbe5906762cc89f63dade27e9bce46a8843f0b1"},{"from":"4fa306410072f83abafae52fc6ac05aae3bed77c","to":"19281599c06330d9a114e9362b41c751e67e3e72"},{"from":"5b4ddc33ef3da7a248025cc228bc9ef7e860740a","to":"9a96926442f477a2b03ae06cfffcab8393748218"},{"from":"5b4ddc33ef3da7a248025cc228bc9ef7e860740a","to":"408a3337cc79ba20939e223697fb6276628992a4"},{"from":"5ec56758dd6d1e29baff78b1bedaa76b91218eb8","to":"e7d8b02bdda51a6101ba2cc3329b5e9bcf96bdf1"},{"from":"5ec56758dd6d1e29baff78b1bedaa76b91218eb8","to":"fd3fb192a472fceed3c90b1a280f28fccec73472"},{"from":"6c9b93b06061698779ec27237a8e1850e67cc974","to":"ab01d92a0b4becd1bfc8a423a0a5956f88113980"},{"from":"6c9b93b06061698779ec27237a8e1850e67cc974","to":"f4d35e47d8a1dd5957a151e0f0451432b02430b3"},{"from":"6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8","to":"4fa306410072f83abafae52fc6ac05aae3bed77c"},{"from":"6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8","to":"9687993785b9a18a2544c6bcc971fcd613f90733"},{"from":"6ec94c2e114d1bceda3402fff155d64b3a52ebba","to":"9a96926442f477a2b03ae06cfffcab8393748218"},{"from":"6ec94c2e114d1bceda3402fff155d64b3a52ebba","to":"408a3337cc79ba20939e223697fb6276628992a4"},{"from":"8f9744b21e618396b12b26688b44678f3171f40d","to":"ab01d92a0b4becd1bfc8a423a0a5956f88113980"},{"from":"8f9744b21e618396b12b26688b44678f3171f40d","to":"19281599c06330d9a114e9362b41c751e67e3e72"},{"from":"94d916abee747e969b7dc3236fbbfb3246086edb","to":"3ce06b54ba2f22a5e9bbb4a9cf370442d3e5a2b8"},{"from":"94d916abee747e969b7dc3236fbbfb3246086edb","to":"07870fcf1cae67fcee108e7e0bac81a4c69842d0"},{"from":"9687993785b9a18a2544c6bcc971fcd613f90733","to":"eac548ea0e79130d7b604fcff22b7bd7f210c9aa"},{"from":"9687993785b9a18a2544c6bcc971fcd613f90733","to":"ca6ebd6b7e0565498fed6e4eafac68913f586b14"},{"from":"9a96926442f477a2b03ae06cfffcab8393748218","to":"f07c09068550591ffd7efda7814ec1dfda4a0da8"},{"from":"9a96926442f477a2b03ae06cfffcab8393748218","to":"b68cb9cd5a5fb031bb2be01dd9d4592e7025add3"},{"from":"9e174571aa0d537ba37cee04048d87a4e27b4102","to":"cfbe5906762cc89f63dade27e9bce46a8843f0b1"},{"from":"9e174571aa0d537ba37cee04048d87a4e27b4102","to":"639762b86c4d2e07cfc65c37c811f936b2276975"},{"from":"a068b7d3bdda0b6d79d900b7a131ad23aa30f5a4","to":"8d9546febb4b105413c7616dc6f02de24cb70b1f"},{"from":"c5f5272c0be702b3457d6b86df1edb15049d7d60","to":"d8a9df2fd10462aa233641cbd4adaa68a50359b8"},{"from":"c5f5272c0be702b3457d6b86df1edb15049d7d60","to":"639762b86c4d2e07cfc65c37c811f936b2276975"},{"from":"ca6ebd6b7e0565498fed6e4eafac68913f586b14","to":"9e174571aa0d537ba37cee04048d87a4e27b4102"},{"from":"ca6ebd6b7e0565498fed6e4eafac68913f586b14","to":"2af1aa0b6cb5edcb656503c2d3cf4e53938b48a8"},{"from":"db81081014be4ef7103e77061d4482b365433b0b","to":"f07c09068550591ffd7efda7814ec1dfda4a0da8"},{"from":"db81081014be4ef7103e77061d4482b365433b0b","to":"f4d35e47d8a1dd5957a151e0f0451432b02430b3"},{"from":"dd57f23e5c5e996ef9ed00464e164da3926e3acd","to":"31047d0a3b53bb4d8fba079e81c8f9bc04882b49"},{"from":"e7d8b02bdda51a6101ba2cc3329b5e9bcf96bdf1","to":"a49fd0b60e3088086fe659ec08a1ce63dc669f6f"},{"from":"e7d8b02bdda51a6101ba2cc3329b5e9bcf96bdf1","to":"f4d35e47d8a1dd5957a151e0f0451432b02430b3"},{"from":"eac548ea0e79130d7b604fcff22b7bd7f210c9aa","to":"cfbe5906762cc89f63dade27e9bce46a8843f0b1"},{"from":"eac548ea0e79130d7b604fcff22b7bd7f210c9aa","to":"d60afbdf581430b780b6184be95375aa1dedc34b"},{"from":"f2aee1c1286747e66ac39bf707dca5ec8db4cd2c","to":"9a96926442f477a2b03ae06cfffcab8393748218"},{"from":"f2aee1c1286747e66ac39bf707dca5ec8db4cd2c","to":"408a3337cc79ba20939e223697fb6276628992a4"},{"from":"fd3fb192a472fceed3c90b1a280f28fccec73472","to":"6c9b93b06061698779ec27237a8e1850e67cc974"},{"from":"fd3fb192a472fceed3c90b1a280f28fccec73472","to":"137079caa44182e93f862b7f749406e8bc964d68"},{"from":"fd3fb192a472fceed3c90b1a280f28fccec73472","to":"94d916abee747e969b7dc3236fbbfb3246086edb"},{"from":"master","to":"5b4ddc33ef3da7a248025cc228bc9ef7e860740a"},{"from":"my-feature","to":"94d916abee747e969b7dc3236fbbfb3246086edb"},{"from":"my-other-branch","to":"9687993785b9a18a2544c6bcc971fcd613f90733"},{"from":"rebase-demo","to":"6ec94c2e114d1bceda3402fff155d64b3a52ebba"},{"from":"simple-merge","to":"6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8"},{"from":"azure-devops/master","to":"5ec56758dd6d1e29baff78b1bedaa76b91218eb8"},{"from":"github/master","to":"5b4ddc33ef3da7a248025cc228bc9ef7e860740a"},{"from":"R0.1","to":"07870fcf1cae67fcee108e7e0bac81a4c69842d0"},{"from":"HEAD","to":"master"}]} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"directory": "git-demo" | ||
} |
6 changes: 6 additions & 0 deletions
6
html/api/objects/blob/05a8da24ba96d54811f7ea93d527968e2dee3c41
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<html> | ||
<head><title>git-demo</title></head> | ||
<body> | ||
Hi! | ||
</body> | ||
</html> |
3 changes: 3 additions & 0 deletions
3
html/api/objects/blob/19281599c06330d9a114e9362b41c751e67e3e72
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
body { | ||
background-color: orange; | ||
} |
4 changes: 4 additions & 0 deletions
4
html/api/objects/blob/31047d0a3b53bb4d8fba079e81c8f9bc04882b49
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
body { | ||
background-color:green; | ||
color: bisque; | ||
} |
3 changes: 3 additions & 0 deletions
3
html/api/objects/blob/639762b86c4d2e07cfc65c37c811f936b2276975
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
body { | ||
background-color: azure; | ||
} |
6 changes: 6 additions & 0 deletions
6
html/api/objects/blob/8d9546febb4b105413c7616dc6f02de24cb70b1f
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<html> | ||
<head><title>git-demo</title></head> | ||
<body> | ||
Hi. | ||
</body> | ||
</html> |
9 changes: 9 additions & 0 deletions
9
html/api/objects/blob/a49fd0b60e3088086fe659ec08a1ce63dc669f6f
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<html> | ||
<head> | ||
<title>git-demo</title> | ||
<link rel="stylesheet" href="./my.css" type="text/css"><link> | ||
</head> | ||
<body> | ||
from another machine. | ||
</body> | ||
</html> |
9 changes: 9 additions & 0 deletions
9
html/api/objects/blob/ab01d92a0b4becd1bfc8a423a0a5956f88113980
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<html> | ||
<head> | ||
<title>git-demo</title> | ||
<link rel="stylesheet" href="./my.css" type="text/css"><link> | ||
</head> | ||
<body> | ||
Hi. cool new feature on the git demo. | ||
</body> | ||
</html> |
8 changes: 8 additions & 0 deletions
8
html/api/objects/blob/ab54f89a11394e63d69de7a0d4f7c81604e7d2d1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
body { | ||
<<<<<<< HEAD | ||
background-color: orange; | ||
======= | ||
background-color:green; | ||
color: bisque; | ||
>>>>>>> 94d916a... probably a conflict | ||
} |
4 changes: 4 additions & 0 deletions
4
html/api/objects/blob/b68cb9cd5a5fb031bb2be01dd9d4592e7025add3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
body { | ||
background-color: orange; | ||
color: purple; | ||
} |
Binary file not shown.
9 changes: 9 additions & 0 deletions
9
html/api/objects/blob/cfbe5906762cc89f63dade27e9bce46a8843f0b1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<html> | ||
<head> | ||
<title>git-demo</title> | ||
<link rel="stylesheet" href="./my.css" type="text/css"><link> | ||
</head> | ||
<body> | ||
Hi. | ||
</body> | ||
</html> |
8 changes: 8 additions & 0 deletions
8
html/api/objects/blob/d289fd405e698899c0b447139b8655f3d1e81114
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
body { | ||
<<<<<<< HEAD | ||
background-color: orange; | ||
======= | ||
background-color:green; | ||
color: bisque; | ||
>>>>>>> probably a conflict | ||
} |
3 changes: 3 additions & 0 deletions
3
html/api/objects/blob/d60afbdf581430b780b6184be95375aa1dedc34b
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
body { | ||
background-color: blue; | ||
} |
9 changes: 9 additions & 0 deletions
9
html/api/objects/blob/d8a9df2fd10462aa233641cbd4adaa68a50359b8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<html> | ||
<head> | ||
<title>git-demo</title> | ||
<link rel="stylesheet" href="./my.css" type="text/css"><link> | ||
</head> | ||
<body> | ||
Hi. cool new feature on a tag in a detached head state. | ||
</body> | ||
</html> |
9 changes: 9 additions & 0 deletions
9
html/api/objects/blob/f07c09068550591ffd7efda7814ec1dfda4a0da8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
<html> | ||
<head> | ||
<title>git-demo</title> | ||
<link rel="stylesheet" href="./my.css" type="text/css"><link> | ||
</head> | ||
<body> | ||
rebase in action | ||
</body> | ||
</html> |
4 changes: 4 additions & 0 deletions
4
html/api/objects/blob/f4d35e47d8a1dd5957a151e0f0451432b02430b3
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
body { | ||
background-color: orange; | ||
color: bisque; | ||
} |
8 changes: 8 additions & 0 deletions
8
html/api/objects/blob/f4e0fc68fae253008d2385e7a7ba22da6729240d
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
body { | ||
<<<<<<< HEAD | ||
background-color: orange; | ||
======= | ||
background-color:green; | ||
color: bisque; | ||
>>>>>>> my-feature | ||
} |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/07870fcf1cae67fcee108e7e0bac81a4c69842d0
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 1e98398fa3fb070cd23563cb6b84d81161e72439 | ||
parent ca6ebd6b7e0565498fed6e4eafac68913f586b14 | ||
author Manuel Riezebosch <[email protected]> 1581348864 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581348864 +0100 | ||
|
||
commit on feature branch |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/0cb5cf41bf6b2103b803b24c1f819864b626df45
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree c5f5272c0be702b3457d6b86df1edb15049d7d60 | ||
parent 07870fcf1cae67fcee108e7e0bac81a4c69842d0 | ||
author Manuel Riezebosch <[email protected]> 1581349641 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581349641 +0100 | ||
|
||
detached, not feeling well |
8 changes: 8 additions & 0 deletions
8
html/api/objects/commit/137079caa44182e93f862b7f749406e8bc964d68
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
tree 8f9744b21e618396b12b26688b44678f3171f40d | ||
parent 6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8 | ||
parent 07870fcf1cae67fcee108e7e0bac81a4c69842d0 | ||
author Manuel Riezebosch <[email protected]> 1581350440 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581350440 +0100 | ||
|
||
Merge branch 'my-feature' | ||
apparently this was an auto-merge |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/250d4d2e39ffdc3f8cdbb3a064b8d53cf1cae85b
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree db81081014be4ef7103e77061d4482b365433b0b | ||
parent 5ec56758dd6d1e29baff78b1bedaa76b91218eb8 | ||
author Manuel Riezebosch <[email protected]> 1581352980 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581352980 +0100 | ||
|
||
rebase demo |
5 changes: 5 additions & 0 deletions
5
html/api/objects/commit/2af1aa0b6cb5edcb656503c2d3cf4e53938b48a8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
tree a068b7d3bdda0b6d79d900b7a131ad23aa30f5a4 | ||
author Manuel Riezebosch <[email protected]> 1581347901 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581347901 +0100 | ||
|
||
first commit |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/408a3337cc79ba20939e223697fb6276628992a4
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 09184c94ef2a8398af0121ab186bedead1d876d2 | ||
parent 5ec56758dd6d1e29baff78b1bedaa76b91218eb8 | ||
author Manuel Riezebosch <[email protected]> 1581352999 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581352999 +0100 | ||
|
||
conflict with rebase branch |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/5b4ddc33ef3da7a248025cc228bc9ef7e860740a
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 9a96926442f477a2b03ae06cfffcab8393748218 | ||
parent 408a3337cc79ba20939e223697fb6276628992a4 | ||
author Manuel Riezebosch <[email protected]> 1581352980 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581353628 +0100 | ||
|
||
rebase demo. |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/5ec56758dd6d1e29baff78b1bedaa76b91218eb8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree e7d8b02bdda51a6101ba2cc3329b5e9bcf96bdf1 | ||
parent fd3fb192a472fceed3c90b1a280f28fccec73472 | ||
author Manuel Riezebosch <[email protected]> 1581351654 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581351654 +0100 | ||
|
||
from another machine |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 4fa306410072f83abafae52fc6ac05aae3bed77c | ||
parent 9687993785b9a18a2544c6bcc971fcd613f90733 | ||
author Manuel Riezebosch <[email protected]> 1581350143 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581350143 +0100 | ||
|
||
easy merge, background orange |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/6ec94c2e114d1bceda3402fff155d64b3a52ebba
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 9a96926442f477a2b03ae06cfffcab8393748218 | ||
parent 408a3337cc79ba20939e223697fb6276628992a4 | ||
author Manuel Riezebosch <[email protected]> 1581352980 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581353136 +0100 | ||
|
||
rebase demo |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/94d916abee747e969b7dc3236fbbfb3246086edb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 3ce06b54ba2f22a5e9bbb4a9cf370442d3e5a2b8 | ||
parent 07870fcf1cae67fcee108e7e0bac81a4c69842d0 | ||
author Manuel Riezebosch <[email protected]> 1581350716 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581350716 +0100 | ||
|
||
probably a conflict |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/9687993785b9a18a2544c6bcc971fcd613f90733
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree eac548ea0e79130d7b604fcff22b7bd7f210c9aa | ||
parent ca6ebd6b7e0565498fed6e4eafac68913f586b14 | ||
author Manuel Riezebosch <[email protected]> 1581348445 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581348445 +0100 | ||
|
||
background in blue |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/ca6ebd6b7e0565498fed6e4eafac68913f586b14
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 9e174571aa0d537ba37cee04048d87a4e27b4102 | ||
parent 2af1aa0b6cb5edcb656503c2d3cf4e53938b48a8 | ||
author Manuel Riezebosch <[email protected]> 1581348281 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581348281 +0100 | ||
|
||
background color in css |
6 changes: 6 additions & 0 deletions
6
html/api/objects/commit/f2aee1c1286747e66ac39bf707dca5ec8db4cd2c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
tree 9a96926442f477a2b03ae06cfffcab8393748218 | ||
parent 408a3337cc79ba20939e223697fb6276628992a4 | ||
author Manuel Riezebosch <[email protected]> 1581352980 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581353570 +0100 | ||
|
||
rebase demo |
7 changes: 7 additions & 0 deletions
7
html/api/objects/commit/fd3fb192a472fceed3c90b1a280f28fccec73472
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
tree 6c9b93b06061698779ec27237a8e1850e67cc974 | ||
parent 137079caa44182e93f862b7f749406e8bc964d68 | ||
parent 94d916abee747e969b7dc3236fbbfb3246086edb | ||
author Manuel Riezebosch <[email protected]> 1581350788 +0100 | ||
committer Manuel Riezebosch <[email protected]> 1581350788 +0100 | ||
|
||
Merge branch 'my-feature-sdasdf' |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/09184c94ef2a8398af0121ab186bedead1d876d2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html a49fd0b60e3088086fe659ec08a1ce63dc669f6f | ||
100644 my.css b68cb9cd5a5fb031bb2be01dd9d4592e7025add3 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/1e98398fa3fb070cd23563cb6b84d81161e72439
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html ab01d92a0b4becd1bfc8a423a0a5956f88113980 | ||
100644 my.css 639762b86c4d2e07cfc65c37c811f936b2276975 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
100644 my.css 639762b86c4d2e07cfc65c37c811f936b2276975 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/3ce06b54ba2f22a5e9bbb4a9cf370442d3e5a2b8
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html ab01d92a0b4becd1bfc8a423a0a5956f88113980 | ||
100644 my.css 31047d0a3b53bb4d8fba079e81c8f9bc04882b49 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/4fa306410072f83abafae52fc6ac05aae3bed77c
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html cfbe5906762cc89f63dade27e9bce46a8843f0b1 | ||
100644 my.css 19281599c06330d9a114e9362b41c751e67e3e72 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/6c9b93b06061698779ec27237a8e1850e67cc974
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html ab01d92a0b4becd1bfc8a423a0a5956f88113980 | ||
100644 my.css f4d35e47d8a1dd5957a151e0f0451432b02430b3 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/8f9744b21e618396b12b26688b44678f3171f40d
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html ab01d92a0b4becd1bfc8a423a0a5956f88113980 | ||
100644 my.css 19281599c06330d9a114e9362b41c751e67e3e72 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/9a96926442f477a2b03ae06cfffcab8393748218
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html f07c09068550591ffd7efda7814ec1dfda4a0da8 | ||
100644 my.css b68cb9cd5a5fb031bb2be01dd9d4592e7025add3 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/9e174571aa0d537ba37cee04048d87a4e27b4102
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html cfbe5906762cc89f63dade27e9bce46a8843f0b1 | ||
100644 my.css 639762b86c4d2e07cfc65c37c811f936b2276975 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
100644 index.html 8d9546febb4b105413c7616dc6f02de24cb70b1f |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/c5f5272c0be702b3457d6b86df1edb15049d7d60
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html d8a9df2fd10462aa233641cbd4adaa68a50359b8 | ||
100644 my.css 639762b86c4d2e07cfc65c37c811f936b2276975 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/db81081014be4ef7103e77061d4482b365433b0b
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html f07c09068550591ffd7efda7814ec1dfda4a0da8 | ||
100644 my.css f4d35e47d8a1dd5957a151e0f0451432b02430b3 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
100644 my.css 31047d0a3b53bb4d8fba079e81c8f9bc04882b49 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/e7d8b02bdda51a6101ba2cc3329b5e9bcf96bdf1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html a49fd0b60e3088086fe659ec08a1ce63dc669f6f | ||
100644 my.css f4d35e47d8a1dd5957a151e0f0451432b02430b3 |
2 changes: 2 additions & 0 deletions
2
html/api/objects/tree/eac548ea0e79130d7b604fcff22b7bd7f210c9aa
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
100644 index.html cfbe5906762cc89f63dade27e9bce46a8843f0b1 | ||
100644 my.css d60afbdf581430b780b6184be95375aa1dedc34b |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
ref: refs/heads/master |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
5b4ddc33ef3da7a248025cc228bc9ef7e860740a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
94d916abee747e969b7dc3236fbbfb3246086edb |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
9687993785b9a18a2544c6bcc971fcd613f90733 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
6ec94c2e114d1bceda3402fff155d64b3a52ebba |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
6de25b8c5cd0cd49dc40d91e96f8e1cc9c2d07d8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
5ec56758dd6d1e29baff78b1bedaa76b91218eb8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
5b4ddc33ef3da7a248025cc228bc9ef7e860740a |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
07870fcf1cae67fcee108e7e0bac81a4c69842d0 |