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
0036381f
Unverified
Commit
0036381f
authored
Jan 03, 2019
by
Rémy Huet
💻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Principe de la gestion non linéaire
parent
89f6067c
Pipeline
#32826
passed with stage
in 18 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
35 additions
and
0 deletions
+35
-0
main.tex
main.tex
+1
-0
src/tex/gestion_non_lineaire/explications_theoriques.tex
src/tex/gestion_non_lineaire/explications_theoriques.tex
+14
-0
src/tikz/arbre.tex
src/tikz/arbre.tex
+20
-0
No files found.
main.tex
View file @
0036381f
...
...
@@ -11,6 +11,7 @@
\usepackage
{
listings
}
\usepackage
{
fancyvrb
}
\usepackage
{
xcolor
}
\usepackage
{
tikz
}
\hypersetup
{
pdfauthor=
{
Rémy Huet, Thibaud Duhautbout
}
,
pdftitle=
{
Api/casoft Init - Jour 4 : Git
}
,
...
...
src/tex/gestion_non_lineaire/explications_theoriques.tex
View file @
0036381f
\begin{frame}
\frametitle
{
Principe de la gestion non linéaire
}
Jusqu'ici, on n'a fait que de la gestion linéaire.
Tous les commits étaient sur
{
\bf
une unique branche
}
(master)
En pratique, tous les commits ne sont pas nécessairement sur la même branche de l'arbre.
\begin{figure}
[h]
\centering
\input
{
src/tikz/arbre.tex
}
\end{figure}
{
\it
Le sens des flèches n’est pas chronologique !
Chaque commit pointe vers son père.
}
\end{frame}
\begin{frame}
...
...
src/tikz/arbre.tex
0 → 100644
View file @
0036381f
\tikzstyle
{
commit
}
=[draw,circle]
\begin{tikzpicture}
[scale=0.8]
\node
[commit, fill=red!50]
(C0)at(0,0)
{
C0
}
;
\node
[commit, fill=red!50]
(C1)at(1.5,0)
{
C1
}
;
\node
[commit, fill=magenta!80]
(C2)at(3,1)
{
C2
}
;
\node
[commit, fill=green!60]
(C3)at(4,-1.5)
{
C3
}
;
\node
[commit, fill=green!60]
(C5)at(6,-1.5)
{
C5
}
;
\node
[commit, fill=green!60]
(C7)at(8,-1.5)
{
C7
}
;
\node
[commit, fill=cyan!90]
(C4)at(5,-2.5)
{
C4
}
;
\node
[commit, fill=cyan!90]
(C6)at(7,-2.5)
{
C6
}
;
\draw
[->, >=latex]
(C1) -- (C0) ;
\draw
[->, >=latex]
(C2) -- (C1) ;
\draw
[->, >=latex]
(C3) -- (C1) ;
\draw
[->, >=latex]
(C5) -- (C3) ;
\draw
[->, >=latex]
(C7) -- (C5) ;
\draw
[->, >=latex]
(C4) -- (C3) ;
\draw
[->, >=latex]
(C6) -- (C4) ;
\draw
[->, >=latex]
(C7) -- (C6) ;
\end{tikzpicture}
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