Changes between Version 15 and Version 16 of WorkingWithGit


Ignore:
Timestamp:
Aug 20, 2016, 9:34:30 PM (5 years ago)
Author:
larryv (Lawrence Velázquez)
Comment:

avoid using "merge" w.r.t. cherry-picking, since merging has a specific technical meaning to Git

Legend:

Unmodified
Added
Removed
Modified
  • WorkingWithGit

    v15 v16  
    8686
    8787=== Merge a single change from master into a release branch ===
    88 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:
     88The 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:
    8989{{{
    9090git log