Skip to content

Commit e678eb6

Browse files
committed
Change cherry-pick demo to mailine demo
1 parent f6146ae commit e678eb6

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

js/demos.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,10 @@ define([], function () {
175175

176176
}
177177

178-
var cherryPick = {
179-
title: 'Cherry Picking',
180-
key: 'cherry',
181-
message: 'Let\'s pick some commits',
178+
var mainline = {
179+
title: 'Mainline',
180+
key: 'mainline',
181+
message: 'Let\'s pick and revert some commits',
182182
commitData: [
183183
{
184184
"id": "e137e9b",
@@ -208,12 +208,12 @@ define([], function () {
208208
},
209209
{
210210
"id": "6f5b3a4",
211-
"tags": [],
211+
"tags": [ "[fix]" ],
212212
"parent": "a17ad66"
213213
},
214214
{
215215
"id": "f6089f6",
216-
"tags": [ "feature" ],
216+
"tags": [],
217217
"parent": "6f5b3a4"
218218
},
219219
{
@@ -228,13 +228,13 @@ define([], function () {
228228
},
229229
{
230230
"id": "ab103f6",
231-
"tags": [],
231+
"tags": [ "feature" ],
232232
"parent": "c681e06"
233233
},
234234
{
235235
"parent": "f6089f6",
236236
"id": "571f0d3",
237-
"tags": [ "merged" ],
237+
"tags": [ "development" ],
238238
"message": "Merge",
239239
"parent2": "ab103f6"
240240
}
@@ -251,6 +251,6 @@ define([], function () {
251251
}
252252

253253
return [
254-
free, freeWithRemote, upstreamChanges, rewrittenHistory, cherryPick
254+
free, freeWithRemote, upstreamChanges, rewrittenHistory, mainline
255255
]
256256
})

0 commit comments

Comments
 (0)