Diff for "Freesurfer_git" - Free Surfer Wiki

Differences between revisions 3 and 19 (spanning 16 versions)

Initial Git Setup (just 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
(remotely)
$> 

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

Modify and commit a data file:

cvs	`cvs commit <file_name>`
git	`git annex unlock <file_name>`
	`git commit <file_name>`
	`git annex copy --to origin <file_name>`

Add a data file:

cvs	`cvs add <file_name>`
cvs	`cvs commit <file_name>`
git	`git annex add <file_name>`
	`git commit <file_name>`
	`git push .`
	`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 3 as of 2015-07-21 11:59:35 → 
  Size: 710
  Editor: ZekeKaufman
  Comment:
+   ← Revision 19 as of 2016-02-29 21:00:52 → ⇥
  Size: 1571
  Editor: ZekeKaufman
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 1:
+== Initial Git Setup (just 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
(remotely)
$> 

$> cvs checkout dev
}}}
-Line 7:
+Line 22:
-||'''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 15:
+Line 36:
-Commit a modified data file:
||'''cvs'''||{{{cvs commit <new_file>}}}||
||<|3>'''git'''||{{{git annex unlock <old_file>}}}||
||{{{git commit <new_file>}}}||
||{{{git annex copy --to origin}}}||
+Modify and commit a 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>}}}||

Add a data file:
||<|2>'''cvs'''||{{{cvs add <file_name>}}}||
||{{{cvs commit <file_name>}}}||
||<|4>'''git'''||{{{git annex add <file_name>}}}||
||{{{git commit <file_name>}}}||
||{{{git push .}}}||
||{{{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}}}||