Diff for "Freesurfer_git" - Free Surfer Wiki

Differences between revisions 2 and 12 (spanning 10 versions)

Initial Git Setup (only do once)

$> git config --global user.name "John Doe"
$> git config --global user.email johndoe@example.com

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	`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 2 as of 2015-07-20 15:36:52 → 
  Size: 394
  Editor: ZekeKaufman
  Comment:
+   ← Revision 12 as of 2015-08-18 12:07:45 → ⇥
  Size: 1253
  Editor: ZekeKaufman
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
-== Checkout out the main branch: ==
+== Initial Git Setup (only do once) ==
 Line 3:
-'''CVS'''
-Line 5:
+Line 4:
-export CVSROOT=/space/repo/1/dev
cvs checkout dev
+$> git config --global user.name "John Doe"
$> git config --global user.email johndoe@example.com
-Line 9:
+Line 8:
-'''git'''
+Checkout out the main branch:
-Line 11:
+Line 10:
-git clone /space/freesurfer/repo/freesurfer
+$> git clone /space/freesurfer/repo/freesurfer

$> cvs checkout dev
-Line 13:
+Line 14:
 Line 17:
-# CVS
export CVSROOT=/space/repo/1/dev
cvs checkout -r stable6 dev
+$> git clone -b stable6 /space/freesurfer/repo/freesurfer

$> cvs checkout -r stable6 dev
 Line 22:
-{{{
# git
git clone -b stable6 /space/freesurfer/repo/freesurfer
}}}
+== Daily Workflow ==
-Line 28:
+Line 25:
-Replace a data file:
+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}}}||