Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Picasoft
APIs
Init
Git
Commits
a433e01e
Unverified
Commit
a433e01e
authored
Jan 15, 2019
by
Rémy Huet
💻
Browse files
Rebase develop onto master
parent
048bc7f2
Pipeline
#33448
passed with stage
in 25 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/tex/gestion_non_lineaire/fusionner_branches.tex
View file @
a433e01e
...
...
@@ -218,6 +218,46 @@ $ git log --graph --decorate --all
\end{beamercolorbox}
\end{frame}
\begin{frame}
[fragile]
\begin{beamercolorbox}
[rounded=true, shadow=true]
{
terminal
}
\begin{Verbatim}
$
git rebase master
\Pause
Rembobinage préalable de head pour pouvoir rejouer votre travail par
-
dessus...
Application de ajout à dev
\Pause
$
git log --graph --decorate
\Pause
*
\textcolor
{
yellow
}{
commit 1b9926f89453896c3f11e1f75b6871d70f35c5a4 (
}{
\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
{
yellow
}{
commit 6fe645e97ba1a69c99438fba05f21902d19f1055 (
}{
\bf\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
red
}{
|
}
Date: Mon Jan 14 15:31:47 2019 +0100
\textcolor
{
red
}{
|
}
\textcolor
{
red
}{
|
}
Avant rebase
\textcolor
{
red
}{
|
}
*
\textcolor
{
yellow
}{
commit 1892470146ed37358a45e8e5cd9715ec0fc3448a
}
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
Merge: 37d2273 2292018
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
Date: Mon Jan 14 14:50:00 2019 +0100
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
Merge branch 'develop'
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
\textcolor
{
myGreen
}{
|
}
*
\textcolor
{
yellow
}{
commit 2292018a27182fef507601140c7f93d679b93678
}
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
Date: Mon Jan 14 14:01:37 2019 +0100
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
Ajout fichier dev
\textcolor
{
myGreen
}{
|
}
\textcolor
{
yellow
}{
|
}
*
\textcolor
{
yellow
}{
|
}
commit 37d2273def21ff6d8bb33f0600220764f67f2ab9
\textcolor
{
yellow
}{
|
}
\textcolor
{
yellow
}{
/
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
yellow
}{
|
}
Date: Mon Jan 14 14:49:12 2019 +0100
[
\ldots
]
\end{Verbatim}
\end{beamercolorbox}
\end{frame}
\begin{frame}
\frametitle
{
Le rebase
}
\framesubtitle
{
Rebase interactif
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment