Differences between revisions 1 and 13 (spanning 12 versions)
⇤ ← Revision 1 as of 2015-07-14 13:50:12 →
Size: 173
Editor: ZekeKaufman
Comment:
← Revision 13 as of 2015-08-18 12:08:48 → ⇥
Size: 1261
Editor: ZekeKaufman
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
Checkout out the repository (trunk): == Initial Git Setup (only do once) ==
Line 4: Line 4:
# CVS
export CVSROOT=/space/repo/1/dev
cvs checkout dev		 $> git config --global user.name "John Doe"
$> git config --global user.email johndoe@nmr.mgh.harvard.edu
Line 9: Line 8:
Checkout out the main branch:
Line 10: Line 10:
# git
git clone /space/freesurfer/repo/freesurfer		 $> git clone /space/freesurfer/repo/freesurfer

$> cvs checkout dev
Line 13: Line 14:

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

Commit a modified 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>}}}||

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

Initial Git Setup (only do once)

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

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