Copy Editing

[sc68cal]

Just some copy changes to make things a bit more clear.

[sc68cal]

Just cherry pick b5a7077, I'm having trouble figuring out how to isolate just one commit. :-\

[defnull]

Thanks! That was fast :)

To answer your (implied) question: Usually each pull request is based on a separate feature-branch that is synchronized with master and only contains the important commits. Example:

git checkout -b my-feature-branch upstream master
... edit or cherry-pick your own commits ...
commit -a -m "My changes"
git rebase origin master # to make sure your branch is up to date and synchronized
# We use rebase here because a merge would clutter the history with merge commits.
git push origin HEAD # to publish your feature branch
# Now open a pull request. You can delete the feature branch if it is no longer needed.
git pull origin :my-feature-branch
git branch -d my-feature-branch

With this workflow, I can merge the whole branch and don't need to cherry-pick commits. For small commit sets, this is not a problem though. I'll just cherry-pick :)