Commit 4b854cda authored by Remy Huet's avatar Remy Huet

Corrections sur les terminaux

parent 18b2383d
Pipeline #42951 failed with stages
in 47 seconds
...@@ -170,7 +170,6 @@ $ echo "Avant rebase" >> API.txt && git commit -am "Avant rebase" \Pause ...@@ -170,7 +170,6 @@ $ echo "Avant rebase" >> API.txt && git commit -am "Avant rebase" \Pause
$ git checkout develop && echo ''Ma première ligne'' >> dev.txt && git commit -am ''ajout à dev'' \Pause $ git checkout develop && echo ''Ma première ligne'' >> dev.txt && git commit -am ''ajout à dev'' \Pause
Basculement sur la branche 'develop' Basculement sur la branche 'develop'
Votre branche est à jour avec 'origin/develop'.
[develop 59eed37] ajout à dev [develop 59eed37] ajout à dev
1 file changed, 1 insertion(+) \Pause 1 file changed, 1 insertion(+) \Pause
$ git log --graph --decorate --all $ git log --graph --decorate --all
...@@ -499,8 +498,7 @@ $ cat dev.txt ...@@ -499,8 +498,7 @@ $ cat dev.txt
Resolution de bug Resolution de bug
Debut nouvelle fonctionnalité Debut nouvelle fonctionnalité
$ git checkout master $ git checkout master
Switched to branch 'master' Switched to branch 'master'\Pause
Your branch is up to date with 'origin/master'.\Pause
$ git show HEAD --oneline $ git show HEAD --oneline
\textcolor{yellow}{db9f68a (}\textcolor{cyan}{HEAD ->} \textcolor{green}{master}\textcolor{yellow}{)} Début de la fonctionnalité F2\Pause \textcolor{yellow}{db9f68a (}\textcolor{cyan}{HEAD ->} \textcolor{green}{master}\textcolor{yellow}{)} Début de la fonctionnalité F2\Pause
$ git cherry-pick -x c586d4d $ git cherry-pick -x c586d4d
......
...@@ -23,6 +23,8 @@ $ git revert HEAD \Pause ...@@ -23,6 +23,8 @@ $ git revert HEAD \Pause
\begin{frame}[fragile] \begin{frame}[fragile]
\begin{beamercolorbox}[rounded=true, shadow=true]{terminal} \begin{beamercolorbox}[rounded=true, shadow=true]{terminal}
\begin{Verbatim} \begin{Verbatim}
$ git show HEAD \Pause
\textcolor{yellow}{commit 6e23b65243628f81924f650466c86ef3a8e42ec5 (}{\bf\textcolor{cyan}{HEAD -> }\textcolor{green}{master}}\textcolor{yellow}{)} \textcolor{yellow}{commit 6e23b65243628f81924f650466c86ef3a8e42ec5 (}{\bf\textcolor{cyan}{HEAD -> }\textcolor{green}{master}}\textcolor{yellow}{)}
Author: huetremy <remy.huet@etu.utc.fr> Author: huetremy <remy.huet@etu.utc.fr>
Date: Fri Jan 11 14:20:59 2019 +0100 Date: Fri Jan 11 14:20:59 2019 +0100
......
...@@ -244,6 +244,8 @@ $\Pause git diff 712951 5b63bd ...@@ -244,6 +244,8 @@ $\Pause git diff 712951 5b63bd
\begin{beamercolorbox}[rounded=true,shadow=true]{terminal} \begin{beamercolorbox}[rounded=true,shadow=true]{terminal}
\vspace{-\seplength} \vspace{-\seplength}
\begin{Verbatim} \begin{Verbatim}
$ git show 5b63b \Pause
\textcolor{yellow}{commit 5b63bd1f9afe4685b60074030960e39bb5152e67 (}{\bf\textcolor{cyan}{HEAD ->}\textcolor{green}{ master}}\textcolor{yellow}{)} \textcolor{yellow}{commit 5b63bd1f9afe4685b60074030960e39bb5152e67 (}{\bf\textcolor{cyan}{HEAD ->}\textcolor{green}{ master}}\textcolor{yellow}{)}
Author: Thibaud Duhautbout <thibaud@duhautbout.ovh> Author: Thibaud Duhautbout <thibaud@duhautbout.ovh>
Date: Thu Jan 3 15:55:33 2019 +0100 Date: Thu Jan 3 15:55:33 2019 +0100
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment