Skip to content

Commit

Permalink
Cleanup in voorbereiding op 1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
maartenberg committed Feb 15, 2016
1 parent 021df2a commit 0957936
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 9 deletions.
4 changes: 2 additions & 2 deletions main.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\documentclass{beamer}
\documentclass[compress]{beamer}

\usepackage{lmodern}
\usepackage{hyperref}
Expand All @@ -9,7 +9,7 @@

\title{Git gud}
\subtitle{Git voor beginners}
\author{Sticky}
\author{Sticky: CommIT}
\date{16 februari 2016}

\usetheme{Frankfurt}
Expand Down
12 changes: 10 additions & 2 deletions sections/gettingstarted.tex
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ \subsection{Repository aanmaken}
\subsection{Bestanden laten bijhouden}
\begin{frame}[fragile]{Je eerste commit}
\begin{enumerate}
\item \texttt{git status}
\item \texttt{git status}: overzicht van wat afwijkt van opgeslagen
\item Bekijk 'untracked files'
\item \texttt{git add bestand1 bestand2 map1}\\ of:
\texttt{git add .}\\
Expand All @@ -37,7 +37,8 @@ \subsection{Bestanden laten bijhouden}

\begin{frame}{Bestanden ontstagen}
\texttt{git add} is ongedaan te maken:\\
\texttt{git reset HEAD <bestand>}
\texttt{git reset HEAD <bestand>}\\
(Zie ook de tekst van \texttt{git status})
\end{frame}

\begin{frame}{Help mijn commit is niet goed}
Expand All @@ -49,6 +50,13 @@ \subsection{Bestanden laten bijhouden}
\alert{Commit moet nieuwste en niet gedeeld zijn}
\end{frame}

\subsubsection{Wat is hier gebeurd?}
\begin{frame}
\begin{center}
graph hier
\end{center}
\end{frame}

\subsubsection{Commit messages}
\begin{frame}{Commit message}
Iedere commit heeft een message:
Expand Down
4 changes: 2 additions & 2 deletions sections/git-structuur.tex
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
\subsection{Locaties}
\begin{frame}
3 plekken waar je gegevens zitten:\\
\vspace{.5cm}
\begin{tabular}{ll}
Working directory & pas je aan, normale map\\
Staging area & bestanden die je gaat committen\\
Repository / \texttt{.git/}&Bevat metadata, objecten
\end{tabular}
Standaard: edit-stage-commit cyclus
% edit-stage-commit cyclus
\end{frame}

\subsection{Gegevensstructuur}
Expand All @@ -29,4 +30,3 @@ \subsection{Gegevensstructuur}
\end{itemize}
\alert{Later (wanneer gedeeld met externe server) niet meer aan (te) passen!}
\end{frame}

2 changes: 1 addition & 1 deletion sections/git-waarom.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\section{Waarom \& hoe git?}
\section[W\&H?]{Waarom \& hoe git?}

\subsection{Version control}
\begin{frame}{Wat is version control?}
Expand Down
5 changes: 3 additions & 2 deletions sections/installing.tex
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\section{Installatie}
\section[Get git]{Installatie}

\subsection{Download}
\begin{frame}
Expand All @@ -13,7 +13,8 @@ \subsection{Download}
\end{frame}

\subsection{Configureren}
\begin{frame}{Instellen}
\begin{frame}{Instellen (doemoment!)}
Installeer Git van de site \url{https://git-scm.com}\\

Wie je bent:
\begin{itemize}
Expand Down
4 changes: 4 additions & 0 deletions sections/whatsnext.tex
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,7 @@
\item \url{https://overapi.com/git/} Cheat sheet!
\end{itemize}
\end{frame}

\begin{frame}{Dat was het dan}
`Ga heen en git gud!'
\end{frame}

0 comments on commit 0957936

Please sign in to comment.