Changes between Version 18 and Version 19 of DarcsEvaluation


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

add git workflow 2

Legend:

Unmodified
Added
Removed
Modified
  • DarcsEvaluation

    v18 v19  
    141141
    142142# Now file contains lines 1,2,3,5,6,7,9
     143}}}
     144
     145Git:
     146{{{
     147mkdir repo1
     148cd repo1
     149git init
     150printf 'Line1\nLine3\nLine5\nLine7\nLine9\n' > file
     151git add *
     152git commit -m patch1
     153
     154printf 'Line1\nFix2\nLine3\nDebug4\nLine5\nFix6\nLine7\nDebug8\nLine9\n' > file
     155
     156git add --patch
     157s  # split the diffs
     158y
     159n
     160y
     161n
     162git commit -m the_fix
     163
     164git reset --hard   # delete all changes in working dir
    143165}}}
    144166