[MacPorts] WorkingWithGit modified

[MacPorts]

Page "WorkingWithGit" was changed by larryv at macports.org
Diff URL: <https://trac.macports.org/wiki/WorkingWithGit?action=diff&version=16>
Revision 16
Comment: avoid using "merge" w.r.t. cherry-picking, since merging has a specific technical meaning to Git
Changes:
-------8<------8<------8<------8<------8<------8<------8<------8<--------
Index: WorkingWithGit
=========================================================================
--- WorkingWithGit (version: 15)
+++ WorkingWithGit (version: 16)
@@ -85,7 +85,7 @@
 Note that the push will fail if the remote repository has new changes. Contrary to Subversion, it does not matter whether your changes conflict with the remote ones. If this happens, you must update your local working copy as described in the [#updating section on fetch the latest changes] and re-try the push.
 
 === Merge a single change from master into a release branch ===
-The equivalent to Subversion's `svn merge -c <revision> .` is `git cherry-pick`. Use `git cherry-pick` to merge a single change from master into a release branch. To do this, look up the commit ID of the commit you want to pick:
+The equivalent to Subversion's `svn merge -c <revision> .` is `git cherry-pick`. Use `git cherry-pick` to apply a single change from master to a release branch. To do this, look up the commit ID of the commit you want to pick:
 {{{
 git log
 # copy the commit ID
-------8<------8<------8<------8<------8<------8<------8<------8<--------

--
Page URL: <https://trac.macports.org/wiki/WorkingWithGit>
MacPorts <https://www.macports.org/>
Ports system for OS X

This is an automated message. Someone added your email address to be
notified of changes on 'WorkingWithGit' page.
If it was not you, please report to .