Differences between revisions 3 and 14 (spanning 11 versions)
⇤ ← Revision 3 as of 2015-07-21 11:59:35 →
Size: 710
Editor: ZekeKaufman
Comment:
← Revision 14 as of 2015-08-18 12:09:12 → ⇥
Size: 1286
Editor: ZekeKaufman
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
== Initial Git Setup (only do once) ==

Configuration settings:
{{{
$> git config --global user.name "John Doe"
$> git config --global user.email johndoe@nmr.mgh.harvard.edu
}}}
Line 2: Line 10:
||'''cvs'''||{{{cvs checkout dev}}}||
||'''git'''||{{{git clone /space/freesurfer/repo/freesurfer}}}||		 {{{
$> git clone /space/freesurfer/repo/freesurfer
Line 5: Line 13:
$> cvs checkout dev
}}}
Line 7: Line 17:
||'''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 16: Line 32:
||'''cvs'''||{{{cvs commit <new_file>}}}||
||<|3>'''git'''||{{{git annex unlock <old_file>}}}||
||{{{git commit <new_file>}}}||
||{{{git annex copy --to origin}}}||		 ||'''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)

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

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