Differences between revisions 3 and 5 (spanning 2 versions)
⇤ ← Revision 3 as of 2015-07-21 11:59:35 →
Size: 710
Editor: ZekeKaufman
Comment:
← Revision 5 as of 2015-07-28 10:17:25 → ⇥
Size: 844
Editor: ZekeKaufman
Comment:
Deletions are marked like this. Additions are marked like this.
Line 16: Line 16:
||'''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>}}}||

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

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>

Undo 1 commit (before push):

git reset --soft HEAD~1

Undo 2 commits:

git reset --soft HEAD~2