-
Notifications
You must be signed in to change notification settings - Fork 6
/
larics-git-tutorial-intro.tex
136 lines (105 loc) · 4.25 KB
/
larics-git-tutorial-intro.tex
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
%----------------------------------------------------------
%
\documentclass[xcolor=dvipsnames]{beamer}%
\mode<presentation> {
\usetheme{CambridgeUS}
\usefonttheme[onlymath]{serif}
\setbeamercovered{transparent}
}
\usepackage{hyperref}
\hypersetup{colorlinks,linkcolor=,urlcolor=blue}
\usepackage{minted}
\usepackage{multicol}
%\usepackage{utf-8}
\setbeamertemplate{itemize item}{\raisebox{0.25ex}{\small\textbullet}}
\setbeamertemplate{itemize subitem}{\raisebox{0.25ex}{\scriptsize\textbullet}}
\graphicspath{{figures/}}
\logo{\resizebox{10mm}{!}{\includegraphics{fer_logo.jpg}}}
\setbeamersize{text margin left=15pt, text margin right=20pt}
\setlength{\leftmarginii}{10pt}
\setbeamertemplate{enumerate item}{
\raisebox{-1.7pt}{\scalebox{2.1}{\textbullet}\hskip-14.3pt}
\hbox to2ex{%
\hfil
\usebeamercolor[bg]{item projected}
\color{fg}
\raisebox{1.7pt}{\scalebox{0.65}{\insertenumlabel}}%
\hfil}
\hskip-5pt%
}
\setbeamertemplate{section in toc}{
\leavevmode\leftskip=3ex%
\llap{%
\usebeamerfont*{section number projected}%
\usebeamercolor{section number projected}%
\begin{pgfpicture}{-1ex}{-0.3ex}{1ex}{2ex}
\color{bg}
\pgfpathcircle{\pgfpoint{0pt}{.75ex}}{1.7ex}
\pgfusepath{fill}
\pgftext[base]{\color{fg}\inserttocsectionnumber}
\end{pgfpicture}\kern2.25ex%
}%
\inserttocsection\par}
\setbeamertemplate{subsection in toc}
{\leavevmode\leftskip=2em$\bullet$\hskip1em\inserttocsubsection\par}
%------------------------------------------------------------------
%%% --------------------------------------------------------------
\title[git basics]
{LARICS git tutorial}
\author[Or\v{s}uli\'{c}, Mikli\'{c}]{Juraj Or\v{s}uli\'{c}, Damjan Mikli\'{c}}
\institute[LARICS]{LARICS Lab\\FER, University of Zagreb}
\date[]{December 2018}
%\AtBeginSection[]
%{
% \begin{frame}<beamer>{Outline}
% \tableofcontents[currentsection]
% \end{frame}
%}
\begin{document}
% ================================================================
\begin{frame}
\titlepage
\end{frame}
% ----------------------------------------------------------------
\section*{Outline}
\begin {frame}
\tableofcontents
\end{frame}
% =============================================================================
\input{preparation.tex}
% =============================================================================
\input{basicbasics.tex}
% =============================================================================
\input{branches.tex}
% =============================================================================
\section{Where to go from here?}
\begin{frame}[fragile]
\frametitle{Tips, further reading and useful links}
\begin{itemize}
\item Install zsh and \href{http://ohmyz.sh/}{oh-my-zsh}, which provide awesome tab completion for git (branch names, commit IDs, git command options...)
\item When you have mastered the merge workflow from this presentation, read up on the rebase workflow described at the \href{http://larics.fer.hr/farm/laricswiki/doku.php?id=software:git}{LARICS git tutorial}, which enables you to produce much cleaner and linear commit history with fewer merges
\end{itemize}
Some additional literature:
\begin{itemize}
\item Every git command supports the \texttt{--help} option, e.g.,
\begin{minted}{console}
> git help
> git branch --help
\end{minted}
\item \href{http://stackoverflow.com/questions/tagged/git}{Stackoverflow} :)
\item \href{https://git-scm.com/book/en/v2}{The Pro Git book} (The git reference)
\item \href{http://rogerdudler.github.io/git-guide/}{git - the simple guide} (sort of an online cheatsheet)
\item \href{http://www-cs-students.stanford.edu/~blynn/gitmagic/}{Git Magic} (tutorial)
\item \href{http://www.gitguys.com/}{Git Guys} (tutorial)
\end{itemize}
\end{frame}
% ----------------------------------------------------------------
\begin{frame}
\begin{itemize}
\item Super cool simulation for practicing advanced git branching: \\ \href{https://learngitbranching.js.org} {https://learngitbranching.js.org}
\item If you have any questions, feel free to send an email to
\href{mailto:[email protected]}{[email protected]}, or drop by LARICS (C-XI-16).
\end{itemize}
\end{frame}
% ================================================================
\end{document}