Differences between revisions 5 and 13 (spanning 8 versions)
⇤ ← Revision 5 as of 2015-07-28 10:17:25 →
Size: 844
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:
== Initial Git Setup (only do once) ==

{{{
$> git config --global user.name "John Doe"
$> git config --global user.email johndoe@nmr.mgh.harvard.edu
}}}
Line 2: Line 9:
||'''cvs'''||{{{cvs checkout dev}}}||
||'''git'''||{{{git clone /space/freesurfer/repo/freesurfer}}}||		 {{{
$> git clone /space/freesurfer/repo/freesurfer
Line 5: Line 12:
$> cvs checkout dev
}}}
Line 7: Line 16:
||'''cvs'''||{{{cvs checkout -r stable6 dev}}}||
||'''git'''||{{{git clone -b stable6 /space/freesurfer/repo/freesurfer}}}||		 {{{
$> git clone -b stable6 /space/freesurfer/repo/freesurfer

$> cvs checkout -r stable6 dev
}}}

== Daily Workflow ==
Line 21: Line 36:
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 44:
||{{{git reset --soft HEAD~1}}}|| ||'''git'''||{{{git reset --soft HEAD~1}}}||
Line 24: Line 46:
||{{{git reset --soft HEAD~2}}}|| ||'''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