Differences between revisions 2 and 9 (spanning 7 versions)
⇤ ← Revision 2 as of 2015-07-20 15:36:52 →
Size: 394
Editor: ZekeKaufman
Comment:
← Revision 9 as of 2015-08-18 11:48:18 → ⇥
Size: 1195
Editor: ZekeKaufman
Comment:
Deletions are marked like this. Additions are marked like this.
Line 1: Line 1:
== Checkout out the main branch: == == Initial Git Setup (only do once) ==
Line 3: Line 3:
'''CVS'''
{{{
export CVSROOT=/space/repo/1/dev
cvs checkout dev
}}}
Line 9: Line 4:
'''git'''
{{{
git clone /space/freesurfer/repo/freesurfer
}}}

== Daily Workflow ==

Checkout out the main branch:
||'''cvs'''||{{{cvs checkout dev}}}||
||'''git'''||{{{git clone /space/freesurfer/repo/freesurfer}}}||
Line 16: Line 14:
{{{
# CVS
export CVSROOT=/space/repo/1/dev
cvs checkout -r stable6 dev
}}}		 ||'''cvs'''||{{{cvs checkout -r stable6 dev}}}||
||'''git'''||{{{git clone -b stable6 /space/freesurfer/repo/freesurfer}}}||
Line 22: Line 17:
{{{
# git
git clone -b stable6 /space/freesurfer/repo/freesurfer
}}}		 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 .}}}||
Line 27: Line 22:
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>}}}||
Line 28: Line 28:
Replace a data file: 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)

Daily Workflow

Checkout out the main branch:

cvs

cvs checkout dev

git

git clone /space/freesurfer/repo/freesurfer

Checkout the stable branch:

cvs

cvs checkout -r stable6 dev

git

git clone -b stable6 /space/freesurfer/repo/freesurfer

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