From bcf7f56797efe5a8538219d3ea3eb2453b129e99 Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Tue, 31 Mar 2015 21:46:33 +0200 Subject: [PATCH] Update push and add section Push and add added, sample project initialized. --- .gitignore | 1 + git.tex | 62 +++++++++++++++++++++++++++++++++++++++++++++++----- preamble.tex | 7 ++++-- 3 files changed, 62 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 7e8eaf1..b9625b0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ *.png *.vrb vc.tex +myfirstproject diff --git a/git.tex b/git.tex index f430355..eef261c 100644 --- a/git.tex +++ b/git.tex @@ -15,7 +15,8 @@ \item Mart Lubbers \item 4th year bachelor AI \item \url{https://github.com/dopefishh/gitflashtalk} - \item SHA of the commit of this presentation: {\tiny\GITAbrHash} + \item SHA of the commit of this presentation: + {\tiny\GITAbrHash} \end{itemize} \end{frame} @@ -24,7 +25,7 @@ \begin{block}{History} \begin{columns} \column{0.4\linewidth} \begin{itemize} - \item Pronounce: \textipa{[g \'i t]} + \item Pronounce: \textipa{[g\'\i t]} \item Linus Thorvalds \item Linux kernel \end{itemize} @@ -74,7 +75,7 @@ \lstinline{# pacman -S git}\\ \lstinline{# yum install git}\\ \lstinline{# emerge --ask dev-vcs/git}\\ - Etc... + Etc\ldots \end{block} \begin{block}{{\Large\Frowny\Smiley} Mac} @@ -91,7 +92,7 @@ \subsection{Getting started} \begin{frame}[fragile] \frametitle{Getting started} - \begin{block}{Check GIT version in (git)bash} + \begin{block}{Check GIT version in (git) bash} \begin{lstlisting} frobnicator@frobmachine:~\$ git --version git version 1.7.10.4 @@ -115,9 +116,9 @@ refs/ \end{block} \end{frame} -\subsection{Four(five) stages} +\subsection{Four (five) stages} \begin{frame} - \frametitle{Four(five) stages} + \frametitle{Four (five) stages} \begin{itemize} \item (Stash) \item Workspace @@ -136,6 +137,55 @@ refs/ \end{figure} \end{frame} +\begin{frame}[fragile] + \frametitle{Add and commit} + \begin{lstlisting} +frobnicator@frobmachine:~/projects/myfirstproject\$ echo "This is a frobfile" > frobbedfile +frobnicator@frobmachine:~/projects/myfirstproject\$ git status +On branch master + +Initial commit + +Untracked files: + (use "git add ..." to include in what will be committed) + + frobbedfile + +nothing added to commit but untracked files present (use "git add" to track) + \end{lstlisting} +\end{frame} + +\begin{frame}[fragile] + \begin{lstlisting} +frobnicator@frobmachine:~/projects/myfirstproject\$ git add frobbedfile +frobnicator@frobmachine:~/projects/myfirstproject\$ git status +On branch master + +Initial commit + +Changes to be committed: + (use "git rm --cached ..." to unstage) + + new file: frobbedfile +frobnicator@frobmachine:~/projects/myfirstproject\$ git commit +[master (root-commit) 2b7355e] Adds frobbedfile + 1 file changed, 1 insertion(+) + create mode 100644 frobbedfile + \end{lstlisting} +\end{frame} + +\begin{frame} + \frametitle{Push} +\end{frame} + +\begin{frame} + \frametitle{Add and commit} +\end{frame} + +\begin{frame} + \frametitle{Add and commit} +\end{frame} + \section{Branching} \end{document} diff --git a/preamble.tex b/preamble.tex index 686633f..cd887ce 100644 --- a/preamble.tex +++ b/preamble.tex @@ -24,11 +24,14 @@ breakatwhitespace=true, breaklines=true, keepspaces=true, - columns=flexible + showspaces=false, + showstringspaces=false, + columns=flexible, + morekeywords={frobnicator,frobmachine} } \AtBeginSection[] -{ +{% \begin{frame} \frametitle{Table of Contents} \tableofcontents[currentsection] -- 2.20.1