Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
courses
Git course
Commits
c22a66bd
Commit
c22a66bd
authored
Aug 29, 2017
by
Mihai Lefter
Browse files
Merge branch 'master' of git.lumc.nl:courses/gitcourse
parents
bc9e18f4
3a554304
Changes
4
Hide whitespace changes
Inline
Side-by-side
README.md
View file @
c22a66bd
...
...
@@ -15,38 +15,36 @@ with colleagues easy ([introduction](http://doc.gitlab.com/ce/gitlab-basics/READ
## Coordinates
In 2017 the course will be given on the following dates:
6 September (10:
3
0 - 17:00), 22 November (9:30 - 16:30).
6 September (10:
0
0 - 17:00), 22 November (9:30 - 16:30).
Details for the next session:
-
Date: September 6th, 2017
-
Time: 10:
3
0 - 17:00
-
Time: 10:
0
0 - 17:00
-
Location: 01-J-01-084
-
Teachers:
-
TBA
-
Wibowo Arindrarto
-
Jonathan Vis
-
Mihai Lefter
-
Registration via www.medgencentre.nl. Direct access to the
[
registration form
](
https://forms.lumc.nl/lumc2/GITcourse
)
.
## Program
Will be updated shortly. Please find below the program from the last course
session only as a guideline.
| Time | Subject | Teacher | Contents |
| ----- | ----------------- | ----------------- | ------------------------- |
| 09:00 |
[
Introduction
](
/uploads/8d5bda06500f9aaa7c117aa6f4738667/introduction.pdf
)
| Jeroen Laros | Welcome, GitLab overview, SSH keys |
| 09:30 |
[
Practical
](
/uploads/61571e1506aab941a54a77bb35d4492d/introduction_handouts.pdf
)
| | |
| 09:45 |
[
Git basics
](
http:bit.ly/1WlfXyj
)
| Wibowo Arindrarto | Basic Git command line fu |
| 10:30 |
[
Practical
](
/uploads/eb2e001db4f605a343e19d23d40e754f/basics_handouts.pdf
)
| | |
| 11:00 | Coffee | | |
| 11:15 |
[
Git and remote repositories
](
/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf
)
| Martijn Vermaat | Sharing and collaborating via GitLab |
| 10:00 |
[
Introduction
](
/uploads/8d5bda06500f9aaa7c117aa6f4738667/introduction.pdf
)
| Mihai Lefter | Welcome, version control introduction |
| 10:30 |
[
Git basics
](
http:bit.ly/1WlfXyj
)
| Wibowo Arindrarto | Basic Git command line flow |
| 11:15 |
[
Practical
](
/uploads/eb2e001db4f605a343e19d23d40e754f/basics_handouts.pdf
)
| | |
| 12:00 | Lunch | | |
| 13:00 |
[
Practical
](
/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf
)
| | |
| 13:30 |
[
Data analysis
](
usecases/
)
| Szymon Kiełbasa | More GitLab, Markdown, data analysis use case |
| 14:30 | Break | | |
| 14:45 |
[
Combining changes by merging
](
/uploads/8627b6a3fcdd655217b0ea56f0b93fd0/merging.pdf
)
| Martijn Vermaat | Commit graph, merging, resolving merge conflicts |
| 15:30 |
[
Practical
](
/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf
)
| | |
| 16:00 | Questions, closing | | |
| 13:00 |
[
Collaboration: remote repositories
](
/uploads/e1239f626e6c32a6c0bd915a0dc716ad/remotes.pdf
)
| Jonathan Vis | Sharing and collaborating via remotes |
| 13:45 |
[
Practical
](
/uploads/dff8ad1b0f947d5866acdcdc70f3d673/remotes_handouts.pdf
)
| | |
| 14:15 | Break | | |
| 14:30 |
[
Collaboration: combining changes by merging
](
/uploads/8627b6a3fcdd655217b0ea56f0b93fd0/merging.pdf
)
| Mihai Lefter | Commit graph, merging, resolving merge conflicts |
| 15:15 |
[
Practical
](
/uploads/9455ef406dfeb0e3c365c015965cd899/merging_handouts.pdf
)
| | |
| 15:45 | Break | | |
| 16:00 |
[
Extras
](
)
| Mihai Lefter | GitLab, GitHub, Markdown, ... |
| 16:30 |
[
Practical
](
)
| | |
| 17:00 | Questions, closing | | |
## Prerequisites
...
...
planning/PLAN.md
View file @
c22a66bd
...
...
@@ -181,5 +181,5 @@
## (16:00 - 16:30) Markdown, GitLab - Mihai
## (1
5
:30 - 1
6
:00) Practical
## (1
6
:30 - 1
7
:00) Practical
remotes/remotes.tex
View file @
c22a66bd
...
...
@@ -2,13 +2,14 @@
\input
{
../shared/shared.tex
}
\author
{
Martijn Vermaat
}
\author
{
Jonathan K. Vis
}
\title
{
\courseTitle
}
\providecommand
{
\mySubTitle
}{
Git and remote repositories
}
\providecommand
{
\myConference
}{
\courseTitle
}
\providecommand
{
\myGroup
}{}
\providecommand
{
\myDepartment
}{
Department of Human Genetics
}
\providecommand
{
\myCenter
}{
Center for Human and Clinical Genetics
}
\providecommand
{
\myCenter
}{}
\providecommand
{
\date
}{
6-9-2017
}
\usetheme
{
lumc
}
...
...
@@ -64,8 +65,8 @@ gitlab
\begin
{
lstlisting
}
[
basicstyle
=
\ttfamily\footnotesize
]
$
git remote -v
gitlab https://git.lumc.nl/
m.vermaat.hg
/tv-series.git (fetch)
gitlab https://git.lumc.nl/
m.vermaat.hg
/tv-series.git (push)
gitlab https://git.lumc.nl/
zorro
/tv-series.git (fetch)
gitlab https://git.lumc.nl/
zorro
/tv-series.git (push)
\end{lstlisting}
\lstinline
{
-v
}
: Include remote location.
...
...
@@ -86,8 +87,8 @@ $ git remote add hue 192.168.0.8:docs/tv-series
\begin
{
lstlisting
}
[
basicstyle
=
\ttfamily\footnotesize
]
$
git remote -v
gitlab https://git.lumc.nl/
m.vermaat.hg
/tv-series.git (fetch)
gitlab https://git.lumc.nl/
m.vermaat.hg
/tv-series.git (push)
gitlab https://git.lumc.nl/
zorro
/tv-series.git (fetch)
gitlab https://git.lumc.nl/
zorro
/tv-series.git (push)
hue 192.168.0.8:docs/tv-series (fetch)
hue 192.168.0.8:docs/tv-series (push)
\end{lstlisting}
...
...
@@ -172,7 +173,7 @@ To hue.remote:docs/tv-series
Instead of creating repositories using
\lstinline
{
git init
}
, you can create a
local
{
\em
clone
}
of an existing
(
remote
)
repository.
\begin
{
lstlisting
}
[
basicstyle
=
\ttfamily\footnotesize
]
$
git clone https://git.lumc.nl/
m.vermaat.hg
/tv-series.git
$
git clone https://git.lumc.nl/
zorro
/tv-series.git
Cloning into 'tv-series'...
remote: Counting objects: 6, done.
remote: Compressing objects: 100
% (4/4), done.
...
...
@@ -186,8 +187,8 @@ Unpacking objects: 100% (6/6), done.
\begin{lstlisting}
[basicstyle=
\ttfamily\footnotesize
]
$
cd tv
-
series
/
$
git remote -v
origin https://git.lumc.nl/
m.vermaat.hg
/tv-series.git (fetch)
origin https://git.lumc.nl/
m.vermaat.hg
/tv-series.git (push)
origin https://git.lumc.nl/
zorro
/tv-series.git (fetch)
origin https://git.lumc.nl/
zorro
/tv-series.git (push)
\end{lstlisting}
\end{pframe}
...
...
shared/shared.tex
View file @
c22a66bd
\providecommand
{
\courseTitle
}{
Code and data management with Git
}
\providecommand
{
\myDate
}{
25
-0
4
-1
6
}
\providecommand
{
\myDate
}{
06
-0
9
-1
7
}
\providecommand
{
\acknowledgements
}{
Martijn Vermaat
\\
Wibowo Arindrarto
\\
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment