|
Size: 1301
Comment:
|
Size: 1309
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| == Initial Git Setup (only do once) == | == Initial Git Setup (just do once) == |
| Line 3: | Line 3: |
| Configuration settings: | |
| Line 5: | Line 6: |
| $> git config --global user.email johndoe@example.com | $> git config --global user.email johndoe@nmr.mgh.harvard.edu |
| Line 9: | Line 10: |
| ||'''cvs'''||{{{cvs checkout dev}}}|| ||'''git'''||{{{git clone /space/freesurfer/repo/freesurfer}}}|| |
{{{ $> git clone /space/freesurfer/repo/freesurfer (remotely) $> $> cvs checkout dev }}} |
| Line 13: | Line 22: |
| ||'''cvs'''||{{{cvs checkout -r stable6 dev}}}|| ||'''git'''||{{{git clone -b stable6 /space/freesurfer/repo/freesurfer}}}|| |
{{{ $> git clone -b stable6 /space/freesurfer/repo/freesurfer $> cvs checkout -r stable6 dev }}} |
Initial Git Setup (just do once)
Configuration settings:
$> git config --global user.name "John Doe" $> git config --global user.email johndoe@nmr.mgh.harvard.edu
Checkout out the main branch:
$> git clone /space/freesurfer/repo/freesurfer (remotely) $> $> cvs checkout dev
Checkout the stable branch:
$> git clone -b stable6 /space/freesurfer/repo/freesurfer $> cvs checkout -r stable6 dev
Daily Workflow
Commit a modified source code file:
cvs |
cvs commit -m "Added new capabilities." <file_name> |
git |
git commit -m "Added new capabilities." <file_name> |
git push . |
Commit a modified data file:
cvs |
cvs commit <file_name> |
git |
git annex unlock <file_name> |
git commit <file_name> |
|
git annex copy --to origin <file_name> |
Remove data file:
cvs |
rm <file_name> |
cvs rm <file_name> |
|
cvs commit -m "Removing <file_name>" <file_name> |
|
git |
git rm <file_name> |
git commit -m "Removing <file_name>" <file_name> |
Undo 1 commit (before push):
git |
git reset --soft HEAD~1 |
Undo 2 commits:
git |
git reset --soft HEAD~2 |