Issue #126 remove usage of upstream and downstream

src/levels/index.js

@@ -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
   ];
 }
 

src/levels/intro/merging.js

@@ -44,7 +44,7 @@ exports.level = {
               "We will `merge` the branch `bugFix` into `master`"
             ],
             "afterMarkdowns": [
-              "Woah! See that? First of all, `master` now points to a commit that has two parents. If you follow the arrows upstream from `master`, you will hit every commit along the way to the root. This means that `master` contains all the work in the repository now.",
+              "Woah! See that? First of all, `master` now points to a commit that has two parents. If you follow the arrows up the commit tree from `master`, you will hit every commit along the way to the root. This means that `master` contains all the work in the repository now.",
               "",
               "Also, see how the colors of the commits changed? To help with learning, I have included some color coordination. Each branch has a unique color. Each commit turns a color that is the blended combination of all the branches that contain that commit.",
               "",
@@ -61,7 +61,7 @@ exports.level = {
               "Let's merge `master` into `bugFix`:"
             ],
             "afterMarkdowns": [
-              "Since `bugFix` was downstream of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.",
+              "Since `bugFix` was an ancestor of `master`, git didn't have to do any work; it simply just moved `bugFix` to the same commit `master` was attached to.",
               "",
               "Now all the commits are the same color, which means each branch contains all the work in the repository! Woohoo!"
             ],

src/levels/intro/rebasing.js

@@ -63,7 +63,7 @@ exports.level = {
               "Now we are checked out on the `master` branch. Let's go ahead and rebase onto `bugFix`..."
             ],
             "afterMarkdowns": [
-              "There! Since `master` was downstream of `bugFix`, git simply moved the `master` branch reference forward in history."
+              "There! Since `master` was an ancestor of `bugFix`, git simply moved the `master` branch reference forward in history."
             ],
             "command": "git rebase bugFix",
             "beforeCommand": "git commit; git checkout -b bugFix C1; git commit; git rebase master; git checkout master"

src/levels/mixed/jugglingCommits2.js

@@ -49,7 +49,7 @@ exports.level = {
           "type": "GitDemonstrationView",
           "options": {
             "beforeMarkdowns": [
-              "Remember that git cherry-pick will plop down a commit from anywhere in the tree onto HEAD (as long as that commit isn't upstream).",
+              "Remember that git cherry-pick will plop down a commit from anywhere in the tree onto HEAD (as long as that commit isn't an ancestor of HEAD).",
               "",
               "Here's a small refresher demo:"
             ],
@@ -196,4 +196,4 @@ exports.level = {
       ]
     }
   }
-};
+};