2015-06-29 14:16:46 +02:00
|
|
|
\documentclass{beamer}
|
|
|
|
|
|
|
|
\usepackage{skb}
|
|
|
|
%\usertheme{Madrid}
|
|
|
|
\setbeamercovered{transparent}
|
|
|
|
\setcounter{tocdepth}{2}
|
|
|
|
\usepackage[french]{babel}
|
|
|
|
%\usepackage[utf8,utf8x]{inputenc}
|
|
|
|
\usepackage[T1]{fontenc}
|
|
|
|
\usepackage{xunicode} %Unicode extras!
|
|
|
|
\usepackage{xltxtra} %Fixes
|
|
|
|
\setmainfont{CaviarDreams}
|
|
|
|
\usepackage{multicol}
|
|
|
|
%\usepackage{colortbtl}
|
|
|
|
\usepackage{graphicx}
|
|
|
|
\usepackage{verbatim} % Pour l'insertion de fichier en mode verbatim
|
|
|
|
\usepackage{ucs}
|
|
|
|
\usepackage{tabto}
|
|
|
|
\usepackage{xcolor}
|
|
|
|
\usepackage{hyperref}
|
|
|
|
\usepackage{hyperxmp}
|
2015-07-15 20:52:22 +02:00
|
|
|
\usepackage{minted}
|
2015-06-29 14:16:46 +02:00
|
|
|
\usepackage{tikz}
|
2015-07-15 20:52:22 +02:00
|
|
|
\usepackage{gitdags}
|
2015-06-29 14:16:46 +02:00
|
|
|
%\usepackage{pstricks}
|
|
|
|
%\usepackage{pst-3d,pst-coil,pst-eps,pst-fill,pst-grad,pst-node,pst-plot,pst-text,pst-tree}
|
|
|
|
|
|
|
|
\hypersetup{%
|
|
|
|
colorlinks=true,linkcolor=blue,urlcolor=blue,pdfpagemode=UseNone,
|
|
|
|
pdftitle={Formation Git},
|
|
|
|
pdfkeywords={SCM, Git},
|
|
|
|
pdfauthor={Benjamin Bohard},
|
|
|
|
pdflang={fr-FR},
|
|
|
|
pdfcopyright={Copyright © 2015 Cadoles}, % Nécessite XeTeX
|
|
|
|
pdflicenseurl={http://creativecommons.org/licenses/by-nc-sa/2.0/fr/},
|
|
|
|
}
|
|
|
|
%\usecolortheme{crane}
|
|
|
|
\definecolor{UniBlue}{RGB}{83,121,180}
|
|
|
|
\definecolor{CleanWhite}{RGB}{255,255,255}
|
2015-07-06 08:55:50 +02:00
|
|
|
\definecolor{DirtyWhite}{RGB}{235,235,255}
|
2015-06-29 14:16:46 +02:00
|
|
|
\setbeamercolor{title}{fg=UniBlue}
|
|
|
|
\setbeamercolor{frametitle}{fg=CleanWhite}
|
|
|
|
\setbeamercolor{structure}{fg=UniBlue}
|
2015-07-06 08:55:50 +02:00
|
|
|
\setbeamertemplate{items}[circle]
|
|
|
|
\setbeamertemplate{blocks}[rounded][shadow=true]
|
|
|
|
\setbeamercolor{block body example}{bg=DirtyWhite}
|
2015-06-29 14:16:46 +02:00
|
|
|
|
|
|
|
\skbconfig[
|
|
|
|
root = ../../../,
|
|
|
|
rep = content,
|
|
|
|
pub = presentations,
|
|
|
|
fig = figures,
|
|
|
|
sli = slides,
|
|
|
|
acr = database/acr,
|
|
|
|
bib = database/bib
|
|
|
|
]{skblocal.tex}
|
|
|
|
|
|
|
|
\setbeamertemplate{background}
|
2015-07-06 08:55:50 +02:00
|
|
|
{\skbinput[from=fig]{cadoles/gray_frame_background}}
|
2015-06-29 14:16:46 +02:00
|
|
|
|
2015-07-20 17:53:41 +02:00
|
|
|
\newcommand{\commande}[1]{\texttt{\scriptsize{#1}}}
|
2015-07-15 20:52:22 +02:00
|
|
|
|
2015-06-29 14:16:46 +02:00
|
|
|
\title[]{Formation Git}
|
|
|
|
\subtitle{Oberthur Cash Protection}
|
|
|
|
|
2015-07-15 20:52:22 +02:00
|
|
|
\author[Equipe Auteur]{Benjamin Bohard}
|
2015-06-29 14:16:46 +02:00
|
|
|
|
|
|
|
\institute[Cadoles]{\skbfigure[width=2cm]{cadoles/logo_01.png}}
|
|
|
|
|
|
|
|
\date{{\small \today}}
|
|
|
|
|
|
|
|
\subject{Talks}
|
|
|
|
|
|
|
|
\AtBeginSubsection[]
|
|
|
|
{
|
|
|
|
\begin{frame}
|
|
|
|
\frametitle{}
|
|
|
|
\tableofcontents[currentsection,currentsubsection]
|
|
|
|
\end{frame}
|
|
|
|
}
|
|
|
|
|
|
|
|
\AtBeginSection[]
|
|
|
|
{
|
|
|
|
\begin{frame}
|
|
|
|
\frametitle{}
|
|
|
|
\tableofcontents[currentsection]
|
|
|
|
\end{frame}
|
|
|
|
}
|
|
|
|
|
|
|
|
%\logo{
|
|
|
|
% \skbfigure[width=2cm]{cadoles/logo_01.png}
|
|
|
|
%}
|
|
|
|
|
|
|
|
\begin{document}
|
|
|
|
|
|
|
|
\skbinput[from=rep]{style/title}
|
|
|
|
|
|
|
|
\part{Fondamentaux}
|
2015-07-15 20:52:22 +02:00
|
|
|
\frame{\partpage}
|
|
|
|
\frame{\tableofcontents[part=1]}
|
2015-06-29 14:16:46 +02:00
|
|
|
\section{Qu'attendre d'un SCM ?}
|
|
|
|
\skbinput[from=rep]{outils/scm/definition}
|
|
|
|
\skbinput[from=rep]{outils/scm/fonctionnalites_attendues}
|
2015-07-20 10:16:18 +02:00
|
|
|
\section{Les caractéristiques de git}
|
2015-06-29 14:16:46 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/presentation}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/decentralise}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/stockage}
|
2015-07-20 10:16:18 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/etats_fichier}
|
2015-06-29 14:16:46 +02:00
|
|
|
\section{S'adapter au processus}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/workflow/branching}
|
2015-06-29 14:16:46 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/workflow/driessen}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/workflow/driessen/schema}
|
2015-07-15 20:52:22 +02:00
|
|
|
\skbinput[from=rep]{commun/questions}
|
|
|
|
\part{Préparation}
|
|
|
|
\frame{\partpage}
|
2015-06-29 14:16:46 +02:00
|
|
|
\section{Installation}
|
2015-07-06 11:28:10 +02:00
|
|
|
\subsection{Côté \emph{client}}
|
2015-06-29 14:16:46 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/installation/windows}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/installation/macos}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/installation/linux}
|
2015-07-06 11:28:10 +02:00
|
|
|
\subsection{Côté \emph{serveur}}
|
2015-07-15 20:52:22 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/web/basicssh}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/web/gitolite}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/web/gitlab}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/web/gogs}
|
2015-06-29 14:16:46 +02:00
|
|
|
\section{Configuration}
|
|
|
|
\subsection{Utilisateur}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/configuration/presentation}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/configuration/user}
|
2015-07-15 20:52:22 +02:00
|
|
|
\subsection{Ergonomie}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/configuration/alias}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/configuration/editeur}
|
2015-07-15 20:52:22 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/configuration/shell}
|
|
|
|
\subsection{Hooks}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/configuration/hooks}
|
|
|
|
\part{Récapitulatif des commandes}
|
|
|
|
\frame{\partpage}
|
|
|
|
\section{Pour démarrer un projet}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/init}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/clone}
|
2015-07-15 20:52:22 +02:00
|
|
|
\section{Pour faire le point}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/status}
|
2015-07-20 10:16:18 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/ls-files}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/diff}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/log}
|
2015-07-20 10:16:18 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/grep}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/cherry}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/show}
|
2015-07-15 20:52:22 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/bisect}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/blame}
|
2015-07-15 20:52:22 +02:00
|
|
|
\section{Pour modifier le contenu du dépôt}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/checkout}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/fetch}
|
2015-07-20 10:16:18 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/pull}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/merge}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/rebase}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/add}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/commit}
|
2015-07-20 10:16:18 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/push}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/cherry-pick}
|
2015-07-20 10:16:18 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/reset}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/clean}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/revert}
|
2015-07-15 20:52:22 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/filter-branch}
|
|
|
|
\section{Pour organiser son développement}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/branch}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes/tag}
|
2015-07-15 20:52:22 +02:00
|
|
|
\section{Aide-mémoire}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/commandes}
|
|
|
|
\part{Mise en pratique}
|
|
|
|
\frame{\partpage}
|
|
|
|
\section{Mise en place}
|
2015-06-29 14:16:46 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_01}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_01/steps}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_02}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_02/steps}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_03}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_03/steps}
|
2015-07-15 20:52:22 +02:00
|
|
|
\section{Dépôt individuel}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_04}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_04/steps}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_05}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_05/steps}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_06}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_06/steps}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_07}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_07/steps}
|
2015-07-20 10:16:18 +02:00
|
|
|
\section{Dépôt commun}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_08}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_08/steps}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_09}
|
2015-07-20 10:16:18 +02:00
|
|
|
%\skbinput[from=rep]{outils/scm/git/exercices/exercice_09/steps}
|
2015-07-15 20:52:22 +02:00
|
|
|
\section{Paquet debian}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_10}
|
|
|
|
\skbinput[from=rep]{outils/scm/git/exercices/exercice_10/steps}
|
2015-07-15 20:52:22 +02:00
|
|
|
\part{Pour aller plus loin}
|
|
|
|
\frame{\partpage}
|
2015-06-29 14:16:46 +02:00
|
|
|
\skbinput[from=rep]{outils/scm/git/references/references}
|
2015-07-15 20:52:22 +02:00
|
|
|
\part{licence}
|
2015-07-06 11:28:10 +02:00
|
|
|
\skbinput[from=rep]{licences/license-cc-by-sa-2.0}
|
2015-06-29 14:16:46 +02:00
|
|
|
|
|
|
|
\end{document}
|