From 96e93882b226c9ea18dcd494bf968703fe96b223 Mon Sep 17 00:00:00 2001
From: Benjamin Bohard <bbohard@cadoles.com>
Date: Mon, 6 Jul 2015 11:28:10 +0200
Subject: [PATCH] Avancement du plan

---
 .../outils/scm/git/exercices/exercice_01.tex  |  5 ++
 presentations/outils/git/formation_git.tex    | 65 ++++++++++++++++++-
 2 files changed, 68 insertions(+), 2 deletions(-)

diff --git a/content/outils/scm/git/exercices/exercice_01.tex b/content/outils/scm/git/exercices/exercice_01.tex
index 5ba1716..d69121e 100644
--- a/content/outils/scm/git/exercices/exercice_01.tex
+++ b/content/outils/scm/git/exercices/exercice_01.tex
@@ -1,3 +1,8 @@
 \begin{frame}
 \frametitle{exercice}
+\framesubtitle{Configuration globale de git}
+Les paramètres de l'application git peuvent être globaux où propres à un dépôt.
+
+L'ergonomie, l'identité, les alias sont souvent les mêmes pour tous les dépôts.
+La première étape consiste généralement à renseigner ces paramètres.
 \end{frame}
diff --git a/presentations/outils/git/formation_git.tex b/presentations/outils/git/formation_git.tex
index e165770..54fe7c6 100644
--- a/presentations/outils/git/formation_git.tex
+++ b/presentations/outils/git/formation_git.tex
@@ -104,12 +104,18 @@
 \skbinput[from=rep]{outils/scm/git/decentralise}
 \skbinput[from=rep]{outils/scm/git/stockage}
 \section{S'adapter au processus}
+\skbinput[from=rep]{outils/scm/workflow/branching}
 \skbinput[from=rep]{outils/scm/workflow/driessen}
+\skbinput[from=rep]{outils/scm/workflow/driessen/schema}
 \part{Pratique}
 \section{Installation}
+\subsection{Côté \emph{client}}
 \skbinput[from=rep]{outils/scm/git/installation/windows}
 \skbinput[from=rep]{outils/scm/git/installation/macos}
 \skbinput[from=rep]{outils/scm/git/installation/linux}
+\subsection{Côté \emph{serveur}}
+\skbinput[from=rep]{outils/scm/git/web/gitlab}
+\skbinput[from=rep]{outils/scm/git/web/gogs}
 \section{Configuration}
 \subsection{Utilisateur}
 \skbinput[from=rep]{outils/scm/git/configuration/presentation}
@@ -119,12 +125,67 @@
 \skbinput[from=rep]{outils/scm/git/configuration/gitignore}
 \skbinput[from=rep]{outils/scm/git/commandes/remote/add}
 \skbinput[from=rep]{outils/scm/git/commandes/branch/track}
+\section{Ergonomie}
+\skbinput[from=rep]{outils/scm/git/configuration/alias}
+\skbinput[from=rep]{outils/scm/git/configuration/editeur}
+\skbinput[from=rep]{outils/scm/git/configuration/bash}
+\section{Commandes}
+\subsection{Pour démarrer un projet}
+\skbinput[from=rep]{outils/scm/git/commandes/init}
+\skbinput[from=rep]{outils/scm/git/commandes/clone}
+\subsection{Pour faire le point}
+\skbinput[from=rep]{outils/scm/git/commandes/status}
+\skbinput[from=rep]{outils/scm/git/commandes/diff}
+\skbinput[from=rep]{outils/scm/git/commandes/log}
+\skbinput[from=rep]{outils/scm/git/commandes/cherry}
+\skbinput[from=rep]{outils/scm/git/commandes/show}
+\skbinput[from=rep]{outils/scm/git/commandes/blame}
+\subsection{Pour modifier le contenu du dépôt}
+\skbinput[from=rep]{outils/scm/git/stockage}
+\skbinput[from=rep]{outils/scm/git/commandes/checkout}
+\skbinput[from=rep]{outils/scm/git/commandes/pull}
+\skbinput[from=rep]{outils/scm/git/commandes/fetch}
+\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/reset}
+\skbinput[from=rep]{outils/scm/git/commandes/clean}
+
+\skbinput[from=rep]{outils/scm/git/commandes/commit}
+\skbinput[from=rep]{outils/scm/git/commandes/cherry-pick}
+\skbinput[from=rep]{outils/scm/git/commandes/revert}
+\skbinupt[from=rep]{outils/scm/git/commandes/push}
+\subsection{Pour organiser son développement}
+\skbinput[from=rep]{outils/scm/git/commandes/branch}
+\skbinput[from=rep]{outils/scm/git/commandes/tag}
 \section{Mise en pratique}
-\skbinput[from=rep]{outils/scm/git/exercices/exercice_01_synopsis}
+\subsection{Mise en place}
 \skbinput[from=rep]{outils/scm/git/exercices/exercice_01}
+\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}
+\subsection{Dépôt individuel}
+\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}
+\subsection{Dépôt commun}
+\skbinput[from=rep]{outils/scm/git/exercices/exercice_07}
+\skbinput[from=rep]{outils/scm/git/exercices/exercice_07/steps}
+\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}
+\skbinput[from=rep]{outils/scm/git/exercices/exercice_09/steps}
+\subsection{Paquet debian}
+\skbinput[from=rep]{outils/scm/git/exercices/exercice_10}
+\skbinput[from=rep]{outils/scm/git/exercices/exercice_10/steps}
 \section{Pour aller plus loin}
 \skbinput[from=rep]{outils/scm/git/references/references}
 \section{licence}
-\skbinput[from=rep]{style/license-cc-by-sa-2.0}
+\skbinput[from=rep]{licences/license-cc-by-sa-2.0}
 
 \end{document}