diff --git a/cours_git.tex b/cours_git.tex index 58decce..8b46628 100644 --- a/cours_git.tex +++ b/cours_git.tex @@ -212,6 +212,22 @@ Prérequis pour suivre ce cours: \end{block} \end{frame} +\begin{frame}{Le merge ``fast-forward''} + \begin{columns} + \column{0.5\textwidth} + \begin{center} + \includegraphics[width=\textwidth]{img/fast-forward} + \end{center} + + \column{0.5\textwidth} + \begin{itemize} + \item Quand il n'y a pas de modifications à fusionner + \item Le pointeur de branche est simplement modifié + \end{itemize} + \end{columns} +\end{frame} + + \subsection*{Les commandes des branches} \begin{frame}[fragile] diff --git a/img/fast-forward.dia b/img/fast-forward.dia new file mode 100644 index 0000000..63bb9ec Binary files /dev/null and b/img/fast-forward.dia differ diff --git a/img/fast-forward.png b/img/fast-forward.png new file mode 100644 index 0000000..a49255e Binary files /dev/null and b/img/fast-forward.png differ