Avant rebase

src/tex/gestion_non_lineaire/fusionner_branches.tex

@@ -159,6 +159,64 @@ $ git log --graph --decorate \Pause
 	\end{block}
 \end{frame}
 
+\begin{frame}[fragile]
+	\frametitle{Le rebase}
+	\framesubtitle{Exemple}
+	\begin{beamercolorbox}[rounded=true,shadow=true]{terminal}
+		\begin{Verbatim}
+$ echo "Avant rebase" >> API.txt && gitc -am "Avant rebase" \Pause
+[master 6fe645e] Avant rebase
+ 1 file changed, 1 insertion(+) \Pause
+
+$ git checkout develop && echo ''Ma première ligne'' >> dev.txt && gitc -am ''ajout à dev'' \Pause
+Basculement sur la branche 'develop'
+Votre branche est à jour avec 'origin/develop'.
+[develop 59eed37] ajout à dev
+ 1 file changed, 1 insertion(+) \Pause
+		\end{Verbatim}
+	\end{beamercolorbox}
+\end{frame}
+
+\begin{frame}[fragile]
+	\begin{beamercolorbox}[rounded=true, shadow=true]{terminal}
+		\begin{Verbatim}
+* \textcolor{yellow}{commit 59eed37beb51329f95e90e6d6a6de85ca36c441a (}{\bf\textcolor{cyan}{HEAD -> }\textcolor{green}{develop}}\textcolor{yellow}{)}
+\textcolor{red}{|} Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{red}{|} Date:   Mon Jan 14 15:33:59 2019 +0100
+\textcolor{red}{|}
+\textcolor{red}{|}     ajout à dev
+\textcolor{red}{|}
+\textcolor{red}{|} * \textcolor{yellow}{commit 6fe645e97ba1a69c99438fba05f21902d19f1055 (}{\bf\textcolor{green}{master}}\textcolor{yellow}{)}
+\textcolor{red}{|} \textcolor{myGreen}{|} Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{red}{|} \textcolor{myGreen}{|} Date:   Mon Jan 14 15:31:47 2019 +0100
+\textcolor{red}{|} \textcolor{myGreen}{|}
+\textcolor{red}{|} \textcolor{myGreen}{|}     Avant rebase
+\textcolor{red}{|} \textcolor{myGreen}{|}
+\textcolor{red}{|} *   \textcolor{yellow}{commit 1892470146ed37358a45e8e5cd9715ec0fc3448a}
+\textcolor{red}{|} \textcolor{yellow}{|}\textcolor{red}{|}  Merge: 37d2273 2292018
+\textcolor{red}{|} \textcolor{yellow}{|}\textcolor{red}{/}  Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{red}{|}\textcolor{red}{/}\textcolor{yellow}{|}   Date:   Mon Jan 14 14:50:00 2019 +0100
+\textcolor{red}{|} \textcolor{yellow}{|}
+\textcolor{red}{|} \textcolor{yellow}{|}       Merge branch 'develop'
+\textcolor{red}{|} \textcolor{yellow}{|}
+* \textcolor{yellow}{|} \textcolor{yellow}{commit 2292018a27182fef507601140c7f93d679b93678}
+\textcolor{cyan}{|} \textcolor{yellow}{|} Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{cyan}{|} \textcolor{yellow}{|} Date:   Mon Jan 14 14:01:37 2019 +0100
+\textcolor{cyan}{|} \textcolor{yellow}{|}
+\textcolor{cyan}{|} \textcolor{yellow}{|}     Ajout fichier dev
+\textcolor{cyan}{|} \textcolor{yellow}{|}
+\textcolor{cyan}{|} * \textcolor{yellow}{commit 37d2273def21ff6d8bb33f0600220764f67f2ab9}
+\textcolor{cyan}{|}\textcolor{cyan}{/}  Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{cyan}{|}   Date:   Mon Jan 14 14:49:12 2019 +0100
+\textcolor{cyan}{|}
+\textcolor{cyan}{|}       Commit sur master
+\textcolor{cyan}{|}
+* \textcolor{yellow}{commit 168efba77dcfd59ba4346fe4a34427b71db75da7}
+[\ldots]
+		\end{Verbatim}
+	\end{beamercolorbox}
+\end{frame}
+
 \begin{frame}
 	\frametitle{Le rebase}
 	\framesubtitle{Rebase interactif}