README.md 4.72 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
Details for the next session:
Mihai Lefter's avatar
Mihai Lefter committed
18
- Date: November 22nd, 2017
Mihai Lefter's avatar
Mihai Lefter committed
19
- Time: 9:30 - 16:30
Mihai Lefter's avatar
Mihai Lefter committed
20
- Location: J1-84
Vermaat's avatar
Vermaat committed
21
- Teachers:
Mihai Lefter's avatar
Mihai Lefter committed
22
  - TBA
Mihai Lefter's avatar
Mihai Lefter committed
23
- Registration via www.medgencentre.nl. Direct access to the [registration form](https://forms.lumc.nl/lumc2/GITcourse).
Mihai Lefter's avatar
Mihai Lefter committed
24

Vermaat's avatar
Vermaat committed
25

Martijn Vermaat's avatar
Martijn Vermaat committed
26
## Program
Vermaat's avatar
Vermaat committed
27

28
29
| Time  | Subject                                                                                | Teacher           | Contents                  |
| ----- | -----------------                                                                      | ----------------- | ------------------------- |
Mihai Lefter's avatar
Mihai Lefter committed
30
31
32
33
34
35
36
37
38
| 09:00 | [Introduction](/uploads/c751916e71cc02c026491fad6c171a7d/introduction.pdf)             | Mihai Lefter      | Welcome, version control introduction |
| 09:30 | [Git basics](/uploads/5c35a9ecd72033b42ef55b602f6cb548/20170906_-_git-course_-_git-basics.pdf) | Wibowo Arindrarto | Basic Git command line flow |
| 10:15 | [Practical](/uploads/d56ee5edaeca415c5430b385750a89de/basics_handouts.pdf)             |                   |                           |
| 11:00 | [Collaboration: combining changes by merging](/uploads/daec1d922f0bfe036adfea260dba26b0/merging.pdf)  | Mihai Lefter   | Commit graph, merging, resolving merge conflicts |
| 11:45 | [Practical](/uploads/286d7abb800c6f3f1540a49a6aefd25b/remotes_handouts.pdf)             |                   |                           |
| 12:30 | Lunch                                                                                  |                   |                           |
| 13:30 | [Collaboration: remote repositories](/uploads/a189f6a373afac0509d96812d7a2b49a/remotes.pdf)   | Jonathan Vis   | Sharing and collaborating via remotes |
| 14:15 | [Practical](/uploads/d8fb514d9181aed85ff2843ce80ec4d0/merging_handouts.pdf)            |                   |                           |
| 15:00 | Questions, closing                                                                     |                   |                           |
Vermaat's avatar
Vermaat committed
39
40
41
42
43

## Prerequisites

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

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
50
51
[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
52
53
54
55
56
57
58
59

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
60
- [Code School - Try Git](https://try.github.io/) (you could even try this
Vermaat's avatar
Vermaat committed
61
  before the course)
Vermaat's avatar
Vermaat committed
62
63
64
- [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)
65
- [Git tutorials at Atlassian](https://www.atlassian.com/git/tutorials)
Vermaat's avatar
Vermaat committed
66
67
- [Learn Git Branching](http://pcottle.github.io/learnGitBranching/)
- [Git cheat sheet](https://git.wiki.kernel.org/index.php/GitCheatSheet)
Vermaat's avatar
Vermaat committed
68
69
70
71
  (useful for printing)


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

Mihai Lefter's avatar
Mihai Lefter committed
73
- September 6th, 2017: Code and data management with Git
Martijn Vermaat's avatar
Martijn Vermaat committed
74
75
- October 14th, 2013: Git introduction course
- June 23rd, 2014: Git introduction course
Vermaat's avatar
Vermaat committed
76
- December 1st, 2015: Code and data management with Git
Vermaat's avatar
Vermaat committed
77
- April 25th, 2016: Code and data management with Git
Vermaat's avatar
Vermaat committed
78

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


Martijn Vermaat's avatar
Martijn Vermaat committed
82
## Using the course materials
Vermaat's avatar
Vermaat committed
83

Martijn Vermaat's avatar
Martijn Vermaat committed
84
85
86
87
88
89
90
91
92
93
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
94
95
96
97
98
99
    git submodule init
    git submodule update

A new presentation can be added like this:

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