README.md 5.51 KB
Newer Older
Martijn Vermaat's avatar
Martijn Vermaat committed
1
# Code and data management with Git
Laros's avatar
Laros committed
2

Martijn Vermaat's avatar
Martijn Vermaat committed
3
This is the website for the course *Code and data management with Git*. This
Vermaat's avatar
Vermaat committed
4
5
6
course consists of an introduction to working with the
[Git](http://git-scm.com/) version control system for data analysis and is
aimed primarily at researchers in the LUMC.
Vermaat's avatar
Vermaat committed
7

Martijn Vermaat's avatar
Martijn Vermaat committed
8
9
10
11
The Git system is widely used by software developers, but can also be used for
project management. In the LUMC we use [GitLab](https://git.lumc.nl) as a
collaborative environment on top of Git. By keeping track of all versions,
history, etc, GitLab makes your projects more reproducible and collaboration
Vermaat's avatar
Vermaat committed
12
with colleagues easy ([introduction](http://doc.gitlab.com/ce/gitlab-basics/README.html)).
Vermaat's avatar
Vermaat committed
13
14


Martijn Vermaat's avatar
Martijn Vermaat committed
15
## Coordinates
Vermaat's avatar
Vermaat committed
16

Mihai Lefter's avatar
Mihai Lefter committed
17
18
19
20
21
22
23
In 2007 the course will be given on the following dates: 
8 June (10:30 - 17:00), 22 November (9:30 - 16:30). 

Details for the next session:
- Date: June 8th, 2017
- Time: 10:30 - 17:00
- Location: 01-J-01-082
Vermaat's avatar
Vermaat committed
24
25
- Teachers:
  - Jeroen Laros (j.f.j.laros@lumc.nl)
Mihai Lefter's avatar
Mihai Lefter committed
26
  - Mihai Lefter (m.lefter@lumc.nl)
Mihai Lefter's avatar
Mihai Lefter committed
27
- Registration via www.medgencentre.nl. Direct access to the [registration form](https://forms.lumc.nl/lumc2/GITcourse).
Mihai Lefter's avatar
Mihai Lefter committed
28

Vermaat's avatar
Vermaat committed
29
30


Martijn Vermaat's avatar
Martijn Vermaat committed
31
## Program
Vermaat's avatar
Vermaat committed
32

Mihai Lefter's avatar
Mihai Lefter committed
33
34
Will be updated shortly. Please find below the program from the last course
session only as a guideline.
Vermaat's avatar
Vermaat committed
35

36
37
| Time  | Subject                                                                                | Teacher           | Contents                  |
| ----- | -----------------                                                                      | ----------------- | ------------------------- |
Laros's avatar
Laros committed
38
| 09:00 | [Introduction](/uploads/8d5bda06500f9aaa7c117aa6f4738667/introduction.pdf)             | Jeroen Laros      | Welcome, GitLab overview, SSH keys |
Laros's avatar
Laros committed
39
| 09:30 | [Practical](/uploads/61571e1506aab941a54a77bb35d4492d/introduction_handouts.pdf)       |                   |                           |
Laros's avatar
Laros committed
40
| 09:45 | [Git basics](http:bit.ly/1WlfXyj)                                                      | Wibowo Arindrarto | Basic Git command line fu |
Laros's avatar
Laros committed
41
| 10:30 | [Practical](/uploads/eb2e001db4f605a343e19d23d40e754f/basics_handouts.pdf)             |                   |                           |
42
| 11:00 | Coffee                                                                                 |                   |                           |
Laros's avatar
Laros committed
43
| 11:15 | [Git and remote repositories](/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf)   | Martijn Vermaat   | Sharing and collaborating via GitLab |
44
| 12:00 | Lunch                                                                                  |                   |                           |
Laros's avatar
Laros committed
45
| 13:00 | [Practical](/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf)            |                   |                           |
Martijn Vermaat's avatar
Martijn Vermaat committed
46
47
| 13:30 | [Data analysis](usecases/)                                                             | Szymon Kiełbasa   | More GitLab, Markdown, data analysis use case |
| 14:30 | Break                                                                                  |                   |                           |
Laros's avatar
Laros committed
48
| 14:45 | [Combining changes by merging](/uploads/8627b6a3fcdd655217b0ea56f0b93fd0/merging.pdf)  | Martijn Vermaat   | Commit graph, merging, resolving merge conflicts |
Laros's avatar
Laros committed
49
| 15:30 | [Practical](/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf)            |                   |                           |
Martijn Vermaat's avatar
Martijn Vermaat committed
50
| 16:00 | Questions, closing                                                                     |                   |                           |
Vermaat's avatar
Vermaat committed
51
52
53
54
55
56


## Prerequisites

Affinity with the UNIX shell is required before taking the course. For
example, our
Mihai Lefter's avatar
Mihai Lefter committed
57
58
59
[Practical Linux Course](https://git.lumc.nl/courses/practical-linux-course)
is more than enough. In addition, uou can find some nice 
[tutorials here](http://www.ee.surrey.ac.uk/Teaching/Unix/).
Vermaat's avatar
Vermaat committed
60
61
62

We encourage you to bring your own laptop, but make sure it has a terminal and
[Git](http://git-scm.com/) installed. We work with
Martijn Vermaat's avatar
Martijn Vermaat committed
63
64
[Linux](http://en.wikipedia.org/wiki/Linux), but Git also runs on Mac OSX.
Windows is not ideal, but here are [some suggestions](WINDOWS.md).
Vermaat's avatar
Vermaat committed
65
66
67
68
69
70
71
72

We can also provide you with a laptop that has all the required software
installed. The lessons are interactive, meaning that you really need a
laptop.


## Further reading

Vermaat's avatar
Vermaat committed
73
- [Code School - Try Git](https://try.github.io/) (you could even try this
Vermaat's avatar
Vermaat committed
74
  before the course)
Vermaat's avatar
Vermaat committed
75
76
77
78
79
80
- [The entire Pro Git book](http://git-scm.com/book) on the official [Git
  website](http://git-scm.com/)
- [Ry's Git Tutorial](http://rypress.com/tutorials/git/index.html)
- [Git tutorials at Atlassian](https://www.atlassian.com/git/tutorial)
- [Learn Git Branching](http://pcottle.github.io/learnGitBranching/)
- [Git cheat sheet](https://git.wiki.kernel.org/index.php/GitCheatSheet)
Vermaat's avatar
Vermaat committed
81
82
83
84
  (useful for printing)


## Past course dates
Vermaat's avatar
Vermaat committed
85

Martijn Vermaat's avatar
Martijn Vermaat committed
86
87
- October 14th, 2013: Git introduction course
- June 23rd, 2014: Git introduction course
Vermaat's avatar
Vermaat committed
88
- December 1st, 2015: Code and data management with Git
Vermaat's avatar
Vermaat committed
89
- April 25th, 2016: Code and data management with Git
Vermaat's avatar
Vermaat committed
90

Martijn Vermaat's avatar
Martijn Vermaat committed
91
For corresponding snapshots of this repository, see [tags](https://git.lumc.nl/humgen/gitcourse/tags).
Vermaat's avatar
Vermaat committed
92
93


Martijn Vermaat's avatar
Martijn Vermaat committed
94
## Using the course materials
Vermaat's avatar
Vermaat committed
95

Martijn Vermaat's avatar
Martijn Vermaat committed
96
97
98
99
100
101
102
103
104
105
There is one [Git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules)
on which this repository depends:

- **[presentation](https://git.lumc.nl/j.f.j.laros/presentation)** template for
  presentations in LaTeX.

First clone this repository, then fetch the data from the submodule:

    git clone https://git.lumc.nl/humgen/gitcourse.git
    cd gitcourse
Vermaat's avatar
Vermaat committed
106
107
108
109
110
111
    git submodule init
    git submodule update

A new presentation can be added like this:

    cd presentation
Vermaat's avatar
Vermaat committed
112
    bash mkpres.sh ../mypresentation