Differences between revisions 4 and 5
Deletions are marked like this. Additions are marked like this.
Line 20: Line 20:

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