Changes between Version 23 and Version 24 of DarcsEvaluation


Ignore:
Timestamp:
Jul 24, 2008 9:11:16 AM (7 years ago)
Author:
nominolo
Comment:

add alternative cherry pick scenario for git

Legend:

Unmodified
Added
Removed
Modified
  • DarcsEvaluation

    v23 v24  
    9494git commit -a -m patch1
    9595
    96 # create the branch (we only need one)
     96# create the branch
    9797git checkout -b branch1  # also switches to the branch
    9898git checkout master      # switch back to master
     
    106106git checkout branch1
    107107git cherry-pick <commit-id from above>
     108
     109# we can also cherry-pick using the GUI
     110git checkout master
     111git checkout -b branch2 master^^  # start a new branch from tree after patch1
     112# we're in branch2 now
     113gitk master  # start the gui for master branch (which containts patch2 & patch3)
     114# in the gui you can rightclick on the desired patch and choose
     115# "cherry-pick" this commit.  et voila, it's in branch2
    108116}}}
    109117