mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-07-14 00:24:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Issue #126 remove usage of upstream and downstream

Browse source
This commit is contained in:
Peter Cottle 2013-09-27 20:39:32 -07:00
parent cfea67ecce
commit 2f9437cbb2
10 changed files with 86 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/levels/mixed/jugglingCommits2.js
View file

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