mirror/pcottle.learnGitBranching
1
0
Fork 0
mirror of https://github.com/pcottle/learnGitBranching.git synced 2025-06-29 17:27:22 +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

2
src/levels/intro/rebasing.js
View file

@ -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"