Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Git
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Picasoft
A
APIs
Init
Git
Commits
524e1bb7
Unverified
Commit
524e1bb7
authored
Jun 22, 2019
by
Rémy Huet
💻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove --decorate
parent
4b854cda
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
14 additions
and
14 deletions
+14
-14
src/tex/gestion_non_lineaire/application_git.tex
src/tex/gestion_non_lineaire/application_git.tex
+2
-2
src/tex/gestion_non_lineaire/fusionner_branches.tex
src/tex/gestion_non_lineaire/fusionner_branches.tex
+4
-4
src/tex/utiliser_versions/annuler_commits.tex
src/tex/utiliser_versions/annuler_commits.tex
+3
-3
src/tex/utiliser_versions/head.tex
src/tex/utiliser_versions/head.tex
+1
-1
src/tex/utiliser_versions/marquer_version.tex
src/tex/utiliser_versions/marquer_version.tex
+1
-1
src/tex/utiliser_versions/parcourir_historique.tex
src/tex/utiliser_versions/parcourir_historique.tex
+3
-3
No files found.
src/tex/gestion_non_lineaire/application_git.tex
View file @
524e1bb7
...
...
@@ -79,7 +79,7 @@ $ git add -A && git commit -m ''Ajout fichier dev'' \Pause
\frametitle
{
Visualisation
}
\framesubtitle
{
Un joli graphe
!
}
\begin
{
itemize
}
\item
En console :
\verb
+
git log
--
graph
--
decorate
--
all
+
\item
En console :
\verb
+
git log
--
graph
--
all
+
\item
Depuis GitLab :
\end
{
itemize
}
\begin
{
center
}
...
...
@@ -96,7 +96,7 @@ Basculement sur la branche 'master'
Votre branche est à jour avec 'origin/master'.
API.txt
\Pause
$
git log
--
graph
--
decorate
--
all
\Pause
$
git log
--
graph
--
all
\Pause
*
\textcolor
{
yellow
}{
commit
2292018
a
27182
fef
507601140
c
7
f
93
d
679
b
93678
(
}{
\bf\textcolor
{
green
}{
develop
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
red
}{
|
}
Date: Mon Jan
14
14
:
01
:
37
2019
+
0100
...
...
src/tex/gestion_non_lineaire/fusionner_branches.tex
View file @
524e1bb7
...
...
@@ -61,7 +61,7 @@ Merge made by the 'recursive' strategy.
\framesubtitle
{
Log !
}
\begin{beamercolorbox}
[rounded=true, shadow=true]
{
terminal
}
\begin{Verbatim}
$
git log
--
graph
--
decorate
\Pause
$
git log
--
graph
\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
...
...
@@ -172,7 +172,7 @@ $ git checkout develop && echo ''Ma première ligne'' >> dev.txt && git commit -
Basculement sur la branche 'develop'
[
develop
59
eed
37
]
ajout à dev
1
file changed,
1
insertion
(+)
\Pause
$
git log --graph
--decorate
--all
$
git log --graph --all
\end{Verbatim}
\end{beamercolorbox}
\end{frame}
...
...
@@ -223,7 +223,7 @@ $ git log --graph --decorate --all
$
git rebase master
\Pause
Rembobinage préalable de head pour pouvoir rejouer votre travail par
-
dessus
\ldots
Application de ajout à dev
\Pause
$
git log --graph
--decorate
\Pause
$
git log --graph
\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
...
...
@@ -266,7 +266,7 @@ Updating 6fe645e..1b9926f
Fast-forward
dev.txt | 1 +
1 file changed, 1 insertion(+)
\Pause
$
git log
--
graph
--
decorate
$
git log
--
graph
\end
{
Verbatim
}
\end
{
beamercolorbox
}
...
...
src/tex/utiliser_versions/annuler_commits.tex
View file @
524e1bb7
...
...
@@ -75,7 +75,7 @@ J'ajoute une ligne à mon fichier
\begin
{
frame
}
[
fragile
]
\begin
{
beamercolorbox
}
[
rounded
=
true, shadow
=
true
]
{
terminal
}
\begin
{
Verbatim
}
$
git log --graph
--decorate
--all
\Pause
$
git log --graph --all
\Pause
*
\textcolor
{
yellow
}{
commit a04da653083b6b0ba3eea2bce98d903acfd0a4d3 (
}{
\bf\textcolor
{
cyan
}{
HEAD ->
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
...
...
@@ -118,7 +118,7 @@ Je suis le premier fichier utilisé pour cette API sur git
J'ajoute une ligne à mon fichier
Encore une ligne en plus
!
\Pause
$
git log --graph
--decorate
--all
\Pause
$
git log --graph --all
\Pause
*
\textcolor
{
yellow
}{
commit a04da653083b6b0ba3eea2bce98d903acfd0a4d3 (
}{
\bf\textcolor
{
cyan
}{
HEAD ->
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
red
}{
|
}
Date: Fri Jan 11 10:16:10 2019 +0100
...
...
@@ -171,7 +171,7 @@ $ git commit -a --amend \Pause
\begin
{
frame
}
[
fragile
]
\begin
{
beamercolorbox
}
[
rounded
=
true, shadow
=
true
]
{
terminal
}
\begin
{
Verbatim
}
$
git log --graph
--decorate
\Pause
$
git log --graph
\Pause
*
\textcolor
{
yellow
}{
commit 168efba77dcfd59ba4346fe4a34427b71db75da7 (
}{
\bf\textcolor
{
cyan
}{
HEAD ->
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
...
...
src/tex/utiliser_versions/head.tex
View file @
524e1bb7
...
...
@@ -6,7 +6,7 @@
\begin{beamercolorbox}
[rounded=true, shadow=true]
{
terminal
}
\begin{Verbatim}
$
git log
--
graph
--
decorate
\Pause
$
git log
--
graph
\Pause
*
\textcolor
{
yellow
}{
commit
5
b
63
bd
1
f
9
afe
4685
b
60074030960
e
39
bb
5152
e
67
(
}{
\bf
\textcolor
{
cyan
}{
HEAD
-
>
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: Thibaud Duhautbout <thibaud@duhautbout.ovh>
\textcolor
{
red
}{
|
}
Date: Thu Jan
3
15
:
55
:
33
2019
+
0100
...
...
src/tex/utiliser_versions/marquer_version.tex
View file @
524e1bb7
...
...
@@ -9,7 +9,7 @@
\begin{beamercolorbox}
[rounded=true, shadow=true]
{
terminal
}
\begin{Verbatim}
$
git tag mon
_
tag HEAD~
1
\Pause
$
git log --graph
--decorate
\Pause
$
git log --graph
\Pause
*
\textcolor
{
yellow
}{
commit 5b63bd1f9afe4685b60074030960e39bb5152e67 (
}{
\bf\textcolor
{
cyan
}{
HEAD ->
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: Thibaud Duhautbout <thibaud@duhautbout.ovh>
\textcolor
{
red
}{
|
}
Date: Thu Jan 3 15:55:33 2019 +0100
...
...
src/tex/utiliser_versions/parcourir_historique.tex
View file @
524e1bb7
...
...
@@ -12,7 +12,7 @@
\begin{beamercolorbox}
[rounded=true, shadow=true]
{
terminal
}
\begin{Verbatim}
$
git log
--
graph
--
decorate
\Pause
$
git log
--
graph
\Pause
*
\textcolor
{
yellow
}{
commit a
04
da
653083
b
6
b
0
ba
3
eea
2
bce
98
d
903
acfd
0
a
4
d
3
(
}{
\bf\textcolor
{
cyan
}{
HEAD
-
>
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
red
}{
|
}
Date: Fri Jan
11
10
:
16
:
10
2019
+
0100
...
...
@@ -57,7 +57,7 @@ $ git status \Pause
\textcolor
{
red
}{
HEAD détachée sur
}
5
b
63
bd
1
rien à valider, la copie de travail est propre
\Pause
$
git log --graph
--decorate
--all
\Pause
$
git log --graph --all
\Pause
*
\textcolor
{
yellow
}{
commit a04da653083b6b0ba3eea2bce98d903acfd0a4d3 (
}{
\bf\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
red
}{
|
}
Date: Fri Jan 11 10:16:10 2019 +0100
...
...
@@ -89,7 +89,7 @@ La position précédente de HEAD était sur 5b63bd1 Second commit
Basculement sur la branche 'master'
Votre branche est à jour avec 'origin
/
master'.
\Pause
$
git log --graph
--decorate
\Pause
$
git log --graph
\Pause
*
\textcolor
{
yellow
}{
commit a04da653083b6b0ba3eea2bce98d903acfd0a4d3 (
}{
\bf\textcolor
{
cyan
}{
HEAD ->
}
\textcolor
{
green
}{
master
}}
\textcolor
{
yellow
}{
)
}
\textcolor
{
red
}{
|
}
Author: huetremy <remy.huet@etu.utc.fr>
\textcolor
{
red
}{
|
}
Date: Fri Jan 11 10:16:10 2019 +0100
...
...
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