Changes between Version 17 and Version 18 of DarcsEvaluation


Ignore:
Timestamp:
Jul 23, 2008 10:22:01 PM (7 years ago)
Author:
nominolo
Comment:

add git workflow 1

Legend:

Unmodified
Added
Removed
Modified
  • DarcsEvaluation

    v17 v18  
    8383
    8484# repo2's and repo3's file now contains lines 1,3,4,5,7
     85}}}
     86
     87Git:
     88{{{
     89mkdir testrepo
     90cd testrepo
     91git init
     92printf 'Line1\nLine3\nLine5\nLine7\n' > file
     93git add *
     94git commit -a -m patch1
     95
     96# create the branch (we only need one)
     97git checkout -b branch1  # also switches to the branch
     98git checkout master      # switch back to master
     99
     100printf 'Line1\nLine2\nLine3\nLine5\nLine6\nLine7\n' > file
     101git commit -a -m patch2
     102printf 'Line1\nLine2\nLine3\nLine4\nLine5\nLine6\nLine7\n' > file
     103git commit -a -m patch3
     104
     105git log --grep=patch3   # prints the commit id for that change
     106git checkout branch1
     107git cherry-pick <commit-id from above>
    85108}}}
    86109