diff --git a/module1/slides/diapos_git.org b/module1/slides/diapos_git.org index 34828e2a55d5e87fe6583ec20a7acb342ed2dd27..49926283308df039a80caa447ddc0eddbaaa014d 100644 --- a/module1/slides/diapos_git.org +++ b/module1/slides/diapos_git.org @@ -864,7 +864,7 @@ qu'un conflit apparaisse. Pas de panique! \end{overlayarea}\vspace{-1\baselineskip} #+END_EXPORT #+LaTeX: \begin{minipage}[t]{.6\linewidth} -- Ça versionne ! (git *hist*)\medskip +- Ça versionne ! (git *log* / *hist*)\medskip - Ça facilite le travail collaboratif\newline (git *merge*) !\medskip - Ça permet de stocker ses modifications localement\newline (git *commit*) !\medskip #+LaTeX: \end{minipage} diff --git a/module1/slides/diapos_git.pdf b/module1/slides/diapos_git.pdf index b21a088f9e185ac24e037cc0afd9eec58a73cbc9..f4fe0b6dc1217ca1d52226c9d465280da3b68b4e 100644 Binary files a/module1/slides/diapos_git.pdf and b/module1/slides/diapos_git.pdf differ