X-Git-Url: https://git.martlubbers.net/?p=ai-gitflashtalk.git;a=blobdiff_plain;f=git.tex;h=2ffc3bd06bcb740571d38d2481b40a9732534eef;hp=9cbbe7ffb686fc1895a0eb8a0bc260790438b20d;hb=2022f26159df929f517f5dee5802465022fd108e;hpb=ef6ac1d041b26604d943402a262b2f0b73c85334 diff --git a/git.tex b/git.tex index 9cbbe7f..2ffc3bd 100644 --- a/git.tex +++ b/git.tex @@ -66,8 +66,7 @@ \end{block} \end{frame} -\section{Basics} -\subsection{Installation} +\section{Installation} \begin{frame}[fragile] \begin{block}{{\Large\Smiley\Smiley} Linux} Depending on the distribution you may have to do:\\ @@ -89,7 +88,7 @@ \end{frame} -\subsection{Getting started} +\section{Getting started \& Workflow} \begin{frame}[fragile] \frametitle{Getting started} \begin{block}{Check GIT version in (GIT) bash} @@ -138,6 +137,7 @@ refs/ \end{figure} \end{frame} +\section{Everything is a commit} \begin{frame}[fragile] \frametitle{Add and commit} \begin{lstlisting} @@ -182,17 +182,33 @@ frobnicator@frobmachine:~/projects/myfirstproject\$ git commit \frametitle{Log \& Checkout} \begin{block}{\texttt{\$ git log}} + \end{block} + \begin{block}{\texttt{\$ git checkout}} + \end{block} \end{frame} +\section{Branching and unevitable merging} \begin{frame} - \frametitle{Add and commit} + \frametitle{Branching} \end{frame} \begin{frame} - \frametitle{Add and commit} + \frametitle{Push \& Pull} +\end{frame} + +\begin{frame} + \frametitle{Merge} \end{frame} -\section{Branching} +\section{Tips \& Tricks} +\begin{frame} + \frametitle{\texttt{/home/frobnicator/.gitconfig}} +\end{frame} + +\begin{frame} + \frametitle{Public key} + +\end{frame} \end{document}