Nelle Varoquaux
CBIO Mines ParisTech, U900 Institut Curie, INSERM
As researchers, you want:
"Piled Higher and Deeper" by Jorge Cham: www.phdcomics.com
Version control system:
$ git init
Initialized empty Git repository in /home/nelle/Projets/SCBC/git-test/.git/
$ git clone git://github.com/schacon/grit.git
git config [options]
git config --global [options]
git config --system [options]
$ git config --global user.name "Your Name Comes Here"
$ git config --global user.email you@yourdomain.com
$ git config --global core.editor vim
$ git config --list
$ git add README
$ git commit -m "My commit message"
git status: show the status of the files of the repository
git log: show commit log
Pro Git Boot, by Scott Chacon: http://git-scm.com/book
Exercises 01_configuring_and_committing.rst
git rm FILENAME
git mv FILENAME TARGET
$ git reset HEAD filename
$ git checkout -- filename1 filename2
Exercises 02_deleting_canceling.rst
git branch: manages branches
- git branch: lists the branches of the local repository
- git branch [branch_name]: creates a branch
- git branch -d [branch_name]: deletes a branch
git checkout: moves to a branch:
Exercises 03_branching.rst
When a conflict emerges, you must manually edit the files:
<<<<<<< HEAD:calc.py print 'the average is', sum(x) / float(len(x)) print 'sumsqdiffs is', sum(diffs) ======= avg = sum(x) / float(len(x)) sumsqdiffs = sum(diffs) / float(len(x)) print 'average is', avg, 'and sumsqdiffs is', sumsqdiffs >>>>>>> edgier:calc.py
Exercises 04_merging.rst
Remote repositories are versions of your project that are hosted on the Internet or network somewhere.
Exercises 05_remotes.rst
In 3 commands:
- git clone --bare my_project my_project.git
- scp -r my_project.git user@git.example.com:/opt/git
- git clone user@git.example.com:/opt/git/my_project.git
Table of Contents | t |
---|---|
Exposé | ESC |
Presenter View | p |
Source Files | s |
Slide Numbers | n |
Notes | 2 |
Help | h |