|
Size: 844
Comment:
|
Size: 1195
Comment:
|
| Deletions are marked like this. | Additions are marked like this. |
| Line 1: | Line 1: |
| == Initial Git Setup (only do once) == == Daily Workflow == |
|
| Line 21: | Line 28: |
| Remove data file: ||<|3>'''cvs'''||{{{rm <file_name>}}}|| ||{{{cvs rm <file_name>}}}|| ||{{{cvs commit -m "Removing <file_name>" <file_name>}}}|| ||<|2>'''git'''||{{{git rm <file_name>}}}|| ||{{{git commit -m "Removing <file_name>" <file_name>}}}|| |
|
| Line 22: | Line 36: |
| ||{{{git reset --soft HEAD~1}}}|| | ||'''git'''||{{{git reset --soft HEAD~1}}}|| |
| Line 24: | Line 38: |
| ||{{{git reset --soft HEAD~2}}}|| | ||'''git'''||{{{git reset --soft HEAD~2}}}|| |
Initial Git Setup (only do once)
Daily Workflow
Checkout out the main branch:
cvs |
cvs checkout dev |
git |
git clone /space/freesurfer/repo/freesurfer |
Checkout the stable branch:
cvs |
cvs checkout -r stable6 dev |
git |
git clone -b stable6 /space/freesurfer/repo/freesurfer |
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 |