Commit 047e389c authored by Jens Wehner's avatar Jens Wehner
Browse files

added figures

parent babb0abe
......@@ -3,13 +3,16 @@
\usetheme{Montpellier}
\centering
\usepackage{listings}
\lstset{
language=bash,
basicstyle=\ttfamily
}
\setbeamertemplate{headline}{}
\beamersetuncovermixins{\opaqueness<1>{25}}{\opaqueness<2->{15}}
\begin{document}
\title{Basics of Git: Organizing and backing up your code and files}
......@@ -19,14 +22,27 @@
\titlepage
\end{frame}
\begin{frame}\frametitle{Table of contents}\tableofcontents
\end{frame}
%\begin{frame}\frametitle{Table of contents}\tableofcontents
%\end{frame}
\section{User story}
\section{Problems}
\begin{frame}
\begin{itemize}
\item Memory
\item Merging
\item Distribution
\item Backup data
\item Documentation
\item Archiving
\end{itemize}
\end{frame}
\section{Survey}
......@@ -53,10 +69,15 @@
\frametitle{Personal experiences}
\begin{itemize}
\item Lotte: Code for optical systems
\item Jens: Baumeier group
\end{itemize}
\end{frame}
\begin{frame}
\frametitle{VOTCA}
\includegraphics[width=0.9\textwidth]{Figs/gitbranches_votca.png}
\end{frame}
\section{Git}
\begin{frame}
......@@ -72,19 +93,22 @@
\end{itemize}
\end{frame}
\begin{frame}
\frametitle{What is a Git repository?}
\begin{block}{\textbf{Git repo(sitory)}: \\
- central place where developers store, share, test and collaborate on web projects, \\
- contains a set of commit objects and a set of references to commit objects.}
\end{block}
\frametitle{What is Git?}
\begin{itemize}
\item Central server to store all files (remote repo)
\item Local copy of files (local repo)
\item Working copy of files
\item \textbf{Control system}: Storing code
\item \textbf{Version Control System}: Maintaining a history of changes
\item \textbf{Distributed Version Control System}: Remote repositories and local repositories
\vspace{4cm}
\begin{picture}(0.1,0.1)
\put(-50.0,-120){\includegraphics[width=0.5\textwidth]{Figs/gitcomp}}
\end{picture}
\end{itemize}
\end{frame}
\begin{frame}
\begin{itemize}
\item In each version, Git only stores files that have changed and references to the other files
......@@ -95,9 +119,14 @@
\includegraphics[width=0.6\textwidth]{Figs/localremote}
\end{frame}
\subsection{Industry standard}
\begin{frame}
\frametitle{Industry standard}
\frametitle{Git}
\includegraphics[width=\textwidth]{Figs/Google_queries.png}
\end{frame}
\begin{frame}
\frametitle{Git}
\includegraphics[width=\textwidth]{Figs/githubcontributors.png}
\end{frame}
\subsection{Distributed VCS}
\begin{frame}
......@@ -123,4 +152,4 @@ Collaborate with team and \textbf{merge} commits
\url{https://www.atlassian.com/git/tutorials/install-git}
\end{frame}
\end{document}
\ No newline at end of file
\end{document}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment