|
|
@@ -109,7 +109,7 @@ Follow this workflow as you work:
|
|
|
|
|
|
9. Push your change to your repository.
|
|
|
|
|
|
- $ git push origin
|
|
|
+ $ git push origin 11038-fix-rhel-link
|
|
|
Username for 'https://github.com': moxiegirl
|
|
|
Password for 'https://moxiegirl@github.com':
|
|
|
Counting objects: 60, done.
|
|
|
@@ -145,58 +145,46 @@ After you push a new branch, you should verify it on GitHub:
|
|
|
|
|
|
You should pull and rebase frequently as you work.
|
|
|
|
|
|
-1. Return to the terminal on your local machine.
|
|
|
+1. Return to the terminal on your local machine and checkout your
|
|
|
+ feature branch in your local `docker-fork` repository.
|
|
|
|
|
|
-2. Make sure you are in your branch.
|
|
|
+2. Fetch any last minute changes from `docker/docker`.
|
|
|
|
|
|
- $ git checkout 11038-fix-rhel-link
|
|
|
+ $ git fetch upstream master
|
|
|
+ From github.com:docker/docker
|
|
|
+ * branch master -> FETCH_HEAD
|
|
|
|
|
|
-3. Fetch all the changes from the `upstream master` branch.
|
|
|
+3. Start an interactive rebase.
|
|
|
|
|
|
- $ git fetch upstream master
|
|
|
+ $ git rebase -i upstream/master
|
|
|
|
|
|
- This command says get all the changes from the `master` branch belonging to
|
|
|
- the `upstream` remote.
|
|
|
+4. Rebase opens an editor with a list of commits.
|
|
|
|
|
|
-4. Rebase your master with the local copy of Docker's `master` branch.
|
|
|
+ pick 1a79f55 Tweak some of the other text for grammar
|
|
|
+ pick 53e4983 Fix a link
|
|
|
+ pick 3ce07bb Add a new line about RHEL
|
|
|
|
|
|
- $ git rebase -i upstream/master
|
|
|
-
|
|
|
- This command starts an interactive rebase to rewrite all the commits from
|
|
|
- Docker's `upstream/master` onto your local branch, and then re-apply each of
|
|
|
- your commits on top of the upstream changes. If you aren't familiar or
|
|
|
- comfortable with rebase, you can <a
|
|
|
- href="http://nathanleclaire.com/blog/2014/09/14/dont-be-scared-of-git-
|
|
|
- rebase" target="_blank">learn more about rebasing</a> on the web.
|
|
|
-
|
|
|
-5. Rebase opens an editor with a list of commits.
|
|
|
+5. Replace the `pick` keyword with `squash` on all but the first commit.
|
|
|
|
|
|
- pick 1a79f55 Tweak some of the other text for grammar
|
|
|
- pick 53e4983 Fix a link
|
|
|
- pick 3ce07bb Add a new line about RHEL
|
|
|
-
|
|
|
- If you run into trouble, `git --rebase abort` removes any changes and gets
|
|
|
- you back to where you started.
|
|
|
+ pick 1a79f55 Tweak some of the other text for grammar
|
|
|
+ squash 53e4983 Fix a link
|
|
|
+ squash 3ce07bb Add a new line about RHEL
|
|
|
|
|
|
-6. Squash the `pick` keyword with `squash` on all but the first commit.
|
|
|
+ After you save the changes and quit from the editor, git starts
|
|
|
+ the rebase, reporting the progress along the way. Sometimes
|
|
|
+ your changes can conflict with the work of others. If git
|
|
|
+ encounters a conflict, it stops the rebase, and prints guidance
|
|
|
+ for how to correct the conflict.
|
|
|
|
|
|
- pick 1a79f55 Tweak some of the other text for grammar
|
|
|
- squash 53e4983 Fix a link
|
|
|
- squash 3ce07bb Add a new line about RHEL
|
|
|
+6. Edit and save your commit message.
|
|
|
|
|
|
- After closing the file, `git` opens your editor again to edit the commit
|
|
|
- message.
|
|
|
+ `git commit -s`
|
|
|
|
|
|
-7. Edit the commit message to reflect the entire change.
|
|
|
+ Make sure your message includes <a href="./set-up-git" target="_blank>your signature</a>.
|
|
|
|
|
|
- Make sure you include your signature.
|
|
|
+7. Force push any changes to your fork on GitHub.
|
|
|
|
|
|
-8. Push any changes to your fork on GitHub.
|
|
|
-
|
|
|
- The rebase rewrote history, so you'll need to use the `-f` or `--force` flag
|
|
|
- to push your change.
|
|
|
-
|
|
|
- $ git push -f origin 11038-fix-rhel-link
|
|
|
+ $ git push -f origin 11038-fix-rhel-link
|
|
|
|
|
|
|
|
|
## Where to go next
|
moxiegirl