Differences between revisions 17 and 69 (spanning 52 versions)
⇤ ← Revision 17 as of 2016-02-29 20:58:48 →
Size: 1559
Editor: ZekeKaufman
Comment:
← Revision 69 as of 2019-02-03 13:21:59 → ⇥
Size: 0
Editor: AndrewHoopes
Comment: no longer needed
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
== 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>}}}||
||<|2>'''git'''||{{{git commit -m "Added new capabilities." <file_name>}}}||
||{{{git push .}}}||

Modify and commit a modify data file:
||'''cvs'''||{{{cvs commit <file_name>}}}||
||<|3>'''git'''||{{{git annex unlock <file_name>}}}||
||{{{git commit <file_name>}}}||
||{{{git annex copy --to origin <file_name>}}}||

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


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

Undo 1 commit (before push):
||'''git'''||{{{git reset --soft HEAD~1}}}||
Undo 2 commits:
||'''git'''||{{{git reset --soft HEAD~2}}}||