Diff for "Freesurfer_git" - Free Surfer Wiki

Differences between revisions 1 and 8 (spanning 7 versions)

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

-  ⇤ ← Revision 1 as of 2015-07-14 13:50:12 → 
  Size: 173
  Editor: ZekeKaufman
  Comment:
+   ← Revision 8 as of 2015-08-13 13:01:28 → ⇥
  Size: 1123
  Editor: ZekeKaufman
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-Checkout out the repository (trunk):
+Checkout out the main branch:
||'''cvs'''||{{{cvs checkout dev}}}||
||'''git'''||{{{git clone /space/freesurfer/repo/freesurfer}}}||
-Line 3:
+Line 5:
-{{{
# CVS
export CVSROOT=/space/repo/1/dev
cvs checkout dev
}}}
-Line 9:
+Line 6:
-{{{
# 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>}}}||
||<|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}}}||