mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-25 23:48:34 +02:00
Issue #126 remove usage of upstream and downstream
This commit is contained in:
parent
cfea67ecce
commit
2f9437cbb2
10 changed files with 86 additions and 85 deletions
|
@ -2,37 +2,37 @@
|
|||
// a sequence proceed in the order listed here
|
||||
exports.levelSequences = {
|
||||
intro: [
|
||||
require('../../levels/intro/commits').level,
|
||||
require('../../levels/intro/branching').level,
|
||||
require('../../levels/intro/merging').level,
|
||||
require('../../levels/intro/rebasing').level
|
||||
require('./intro/commits').level,
|
||||
require('./intro/branching').level,
|
||||
require('./intro/merging').level,
|
||||
require('./intro/rebasing').level
|
||||
],
|
||||
rampup: [
|
||||
require('../../levels/rampup/detachedHead').level,
|
||||
require('../../levels/rampup/relativeRefs').level,
|
||||
require('../../levels/rampup/relativeRefs2').level,
|
||||
require('../../levels/rampup/reversingChanges').level
|
||||
require('./rampup/detachedHead').level,
|
||||
require('./rampup/relativeRefs').level,
|
||||
require('./rampup/relativeRefs2').level,
|
||||
require('./rampup/reversingChanges').level
|
||||
],
|
||||
move: [
|
||||
require('../../levels/rampup/cherryPick').level,
|
||||
require('../../levels/rampup/interactiveRebase').level
|
||||
require('./rampup/cherryPick').level,
|
||||
require('./rampup/interactiveRebase').level
|
||||
],
|
||||
mixed: [
|
||||
require('../../levels/mixed/grabbingOneCommit').level,
|
||||
require('../../levels/mixed/jugglingCommits').level,
|
||||
require('../../levels/mixed/jugglingCommits2').level
|
||||
require('./mixed/grabbingOneCommit').level,
|
||||
require('./mixed/jugglingCommits').level,
|
||||
require('./mixed/jugglingCommits2').level
|
||||
],
|
||||
advanced: [
|
||||
require('../../levels/rebase/manyRebases').level,
|
||||
require('../../levels/advanced/multipleParents').level,
|
||||
require('../../levels/rebase/selectiveRebase').level
|
||||
require('./rebase/manyRebases').level,
|
||||
require('./advanced/multipleParents').level,
|
||||
require('./rebase/selectiveRebase').level
|
||||
]
|
||||
};
|
||||
|
||||
if (typeof window !== 'undefined' && window.location &&
|
||||
window.location.href.indexOf('showRemote') !== -1) {
|
||||
exports.levelSequences.remote = [
|
||||
require('../../levels/remote/clone').level
|
||||
require('./remote/clone').level
|
||||
];
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue