Merge log

src/tex/gestion_non_lineaire/fusionner_branches.tex

@@ -38,6 +38,59 @@
 	\end{block}
 \end{frame}
 
+\begin{frame}[fragile]
+	\frametitle{Le merge}
+	\framesubtitle{Application}
+	\begin{beamercolorbox}[rounded=true, shadow=true]{terminal}
+		\begin{Verbatim}
+$ echo nouvelle ligne >> API.txt && git commit -am "Commit sur master" \Pause
+[master 37d2273] Commit sur master
+ 1 file changed, 1 insertion(+) \Pause
+
+$ git merge develop \Pause
+Merge made by the 'recursive' strategy.
+ dev.txt | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+ create mode 100644 dev.txt \Pause
+		\end{Verbatim}
+	\end{beamercolorbox}
+\end{frame}
+
+\begin{frame}[fragile]
+	\frametitle{Le merge}
+	\framesubtitle{Log !}
+	\begin{beamercolorbox}[rounded=true, shadow=true]{terminal}
+		\begin{Verbatim}
+$ git log --graph --decorate \Pause
+
+*   \textcolor{yellow}{commit 1892470146ed37358a45e8e5cd9715ec0fc3448a (}{\bf\textcolor{cyan}{HEAD -> }\textcolor{green}{master}}\textcolor{yellow}{)}
+\textcolor{red}{|}\textcolor{myGreen}{|}  Merge: 37d2273 2292018
+\textcolor{red}{|} \textcolor{myGreen}{|} Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{red}{|} \textcolor{myGreen}{|} Date:   Mon Jan 14 14:50:00 2019 +0100
+\textcolor{red}{|} \textcolor{myGreen}{|}
+\textcolor{red}{|} \textcolor{myGreen}{|}     Merge branch 'develop'
+\textcolor{red}{|} \textcolor{myGreen}{|}
+\textcolor{red}{|} * \textcolor{yellow}{commit 2292018a27182fef507601140c7f93d679b93678 (}{\bf\textcolor{green}{develop}}\textcolor{yellow}{)}
+\textcolor{red}{|} \textcolor{myGreen}{|} Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{red}{|} \textcolor{myGreen}{|} Date:   Mon Jan 14 14:01:37 2019 +0100
+\textcolor{red}{|} \textcolor{myGreen}{|}
+\textcolor{red}{|} \textcolor{myGreen}{|}     Ajout fichier dev
+\textcolor{red}{|} \textcolor{myGreen}{|}
+* \textcolor{myGreen}{|} \textcolor{yellow}{commit 37d2273def21ff6d8bb33f0600220764f67f2ab9}
+\textcolor{myGreen}{|}\textcolor{myGreen}{/}  Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{myGreen}{|}   Date:   Mon Jan 14 14:49:12 2019 +0100
+\textcolor{myGreen}{|}
+\textcolor{myGreen}{|}       Commit sur master
+\textcolor{myGreen}{|}
+* \textcolor{yellow}{commit 168efba77dcfd59ba4346fe4a34427b71db75da7}
+\textcolor{myGreen}{|} Author: huetremy <remy.huet@etu.utc.fr>
+\textcolor{myGreen}{|} Date:   Fri Jan 11 14:53:09 2019 +0100
+\textcolor{myGreen}{|}
+\textcolor{myGreen}{|}     Commit supplémentaire
+		\end{Verbatim}
+	\end{beamercolorbox}
+\end{frame}
+
 \begin{frame}[fragile]
 	\frametitle{Le rebase}
 	\framesubtitle{Avertissement}