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
7cc2c03b
Unverified
Commit
7cc2c03b
authored
Jan 14, 2019
by
Rémy Huet
💻
Browse files
Avant rebase
parent
f5a8e376
Pipeline
#33407
passed with stage
in 20 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/tex/gestion_non_lineaire/fusionner_branches.tex
View file @
7cc2c03b
...
...
@@ -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
59
eed
37
]
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
59
eed
37
beb
51329
f
95
e
90
e
6
d
6
a
6
de
85
ca
36
c
441
a
(
}{
\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
6
fe
645
e
97
ba
1
a
69
c
99438
fba
05
f
21902
d
19
f
1055
(
}{
\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
1892470146
ed
37358
a
45
e
8
e
5
cd
9715
ec
0
fc
3448
a
}
\textcolor
{
red
}{
|
}
\textcolor
{
yellow
}{
|
}
\textcolor
{
red
}{
|
}
Merge:
37
d
2273
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
2292018
a
27182
fef
507601140
c
7
f
93
d
679
b
93678
}
\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
37
d
2273
def
21
ff
6
d
8
bb
33
f
0600220764
f
67
f
2
ab
9
}
\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
168
efba
77
dcfd
59
ba
4346
fe
4
a
34427
b
71
db
75
da
7
}
[
\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
.
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