Skip to content
GitLab
Menu
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
f5a8e376
Unverified
Commit
f5a8e376
authored
Jan 14, 2019
by
Rémy Huet
💻
Browse files
Merge log
parent
e66b68e4
Pipeline
#33389
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 @
f5a8e376
...
@@ -38,6 +38,59 @@
...
@@ -38,6 +38,59 @@
\end{block}
\end{block}
\end{frame}
\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
37
d
2273
]
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
1892470146
ed
37358
a
45
e
8
e
5
cd
9715
ec
0
fc
3448
a
(
}{
\bf\textcolor
{
cyan
}{
HEAD
-
>
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
\textcolor
{
myGreen
}{
|
}
Merge:
37
d
2273
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
2292018
a
27182
fef
507601140
c
7
f
93
d
679
b
93678
(
}{
\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
37
d
2273
def
21
ff
6
d
8
bb
33
f
0600220764
f
67
f
2
ab
9
}
\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
168
efba
77
dcfd
59
ba
4346
fe
4
a
34427
b
71
db
75
da
7
}
\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
]
\begin
{
frame
}
[
fragile
]
\frametitle
{
Le rebase
}
\frametitle
{
Le rebase
}
\framesubtitle
{
Avertissement
}
\framesubtitle
{
Avertissement
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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