Differences between revisions 18 and 23 (spanning 5 versions)
⇤ ← Revision 18 as of 2016-02-29 21:00:30 →
Size: 1571
Editor: ZekeKaufman
Comment:
← Revision 23 as of 2016-09-26 16:47:44 → ⇥
Size: 1671
Editor: ZekeKaufman
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
#acl LcnGroup:read,write,delete,revert All:
Line 34: Line 36:
||{{{git push .}}}|| ||{{{git push}}}||
Line 38: Line 40:
||<|3>'''git'''||{{{git annex unlock <file_name>}}}|| ||<|5>'''git'''||{{{git annex unlock <file_name>}}}||
||{{{git annex add <file_name>}}}||
Line 40: Line 43:
||{{{git push}}}||
Line 45: Line 49:
||<|3>'''git'''||{{{git annex add <file_name>}}}|| ||<|4>'''git'''||{{{git annex add <file_name>}}}||
Line 47: Line 51:
||{{{git push .}}}|| ||{{{git push}}}||

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

Modify and commit a data file:

cvs

cvs commit <file_name>

git

git annex unlock <file_name>

git annex add <file_name>

git commit <file_name>

git push

git annex copy --to origin <file_name>

Add a data file:

cvs

cvs add <file_name>

cvs commit <file_name>

git

git annex add <file_name>

git commit <file_name>

git push

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