Differences between revisions 13 and 20 (spanning 7 versions)
⇤ ← Revision 13 as of 2015-08-18 12:08:48 →
Size: 1261
Editor: ZekeKaufman
Comment:
← Revision 20 as of 2016-03-17 02:43:29 → ⇥
Size: 1608
Editor: ZekeKaufman
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 10: Line 11:
Line 11: Line 13:
(remotely)
$>
Line 14: Line 18:

Line 30: Line 36:
Commit a modified data file: Modify and commit a data file:
Line 32: Line 38:
||<|3>'''git'''||{{{git annex unlock <file_name>}}}|| ||<|4>'''git'''||{{{git annex unlock <file_name>}}}||
||{{{git annex add <file_name>}}}||
Line 35: Line 42:

Add a data file:
||<|2>'''cvs'''||{{{cvs add <file_name>}}}||
||{{{cvs commit <file_name>}}}||
||<|4>'''git'''||{{{git annex add <file_name>}}}||
||{{{git commit <file_name>}}}||
||{{{git push .}}}||
||{{{git annex copy --to origin <file_name>}}}||

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 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