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

Clarify "pick" vs. "drop" in interactive rebase

Browse source
This commit is contained in:
Waldir Pimenta 2021-01-05 12:26:15 +00:00 • committed by GitHub
parent b906bb5fcd
commit 3128cddef8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/levels/rampup/interactiveRebase.js
View file

@ -78,8 +78,8 @@ exports.level = {
"When the interactive rebase dialog opens, you have the ability to do two things in our educational application:", "When the interactive rebase dialog opens, you have the ability to do two things in our educational application:",
"", "",
"* You can reorder commits simply by changing their order in the UI (via dragging and dropping with the mouse).", "* You can reorder commits simply by changing their order in the UI (via dragging and dropping with the mouse).",
"* You can choose to keep all commits or drop specific ones. When the dialog opens, each commit is set to being included by the `pick` " + "* You can choose to keep all commits or drop specific ones. When the dialog opens, each commit is set to be included by the `pick` " +
"button being active. To drop a commit, click the `pick` button to toggle it off.", "button next to it being active. To drop a commit, toggle off its `pick` button.",
"", "",
"*It is worth mentioning that in the real git interactive rebase you can do many more things like squashing (combining) commits, " + "*It is worth mentioning that in the real git interactive rebase you can do many more things like squashing (combining) commits, " +
"amending commit messages, and even editing the commits themselves. For our purposes though we will focus on these two operations above.*", "amending commit messages, and even editing the commits themselves. For our purposes though we will focus on these two operations above.*",