Skip to content
Snippets Groups Projects
Commit a07dbc20 authored by Philippe Dosch's avatar Philippe Dosch
Browse files

Introduces tree of commits

parent 2d809300
No related branches found
No related tags found
No related merge requests found
arbre.obj 0 → 100644
%TGIF 4.2.5-QPL
state(0,37,100.000,0,0,0,16,1,0,1,1,2,0,1,0,1,0,'Helvetica',0,138240,0,2,1,10,0,0,1,1,0,16,0,0,1,1,1,1,1050,1485,1,0,2880,0).
%
% @(#)$Header$
% %W%
%
unit("1 pixel/pixel").
color_info(50,65535,0,[
"Black", 0, 0, 0, 0, 0, 0, 1,
"White", 65535, 65535, 65535, 65535, 65535, 65535, 1,
"#000080", 0, 0, 32896, 0, 0, 32768, 1,
"#008000", 0, 32896, 0, 0, 32768, 0, 1,
"#008080", 0, 32896, 32896, 0, 32768, 32768, 1,
"#800000", 32896, 0, 0, 32768, 0, 0, 1,
"#800080", 32896, 0, 32896, 32768, 0, 32768, 1,
"#ff8000", 65535, 32896, 0, 65280, 32768, 0, 1,
"#808080", 32896, 32896, 32896, 32768, 32768, 32768, 1,
"#c0c0c0", 49344, 49344, 49344, 49152, 49152, 49152, 1,
"#0000ff", 0, 0, 65535, 0, 0, 65280, 1,
"#00ff00", 0, 65535, 0, 0, 65280, 0, 1,
"#00ffff", 0, 65535, 65535, 0, 65280, 65280, 1,
"#ff0000", 65535, 0, 0, 65280, 0, 0, 1,
"#ff00ff", 65535, 0, 65535, 65280, 0, 65280, 1,
"#ffff00", 65535, 65535, 0, 65280, 65280, 0, 1,
"#4c4c4c", 19532, 19532, 19532, 19456, 19456, 19456, 1,
"#b3b3b3", 46003, 46003, 46003, 45824, 45824, 45824, 1,
"#e6e6e6", 59110, 59110, 59110, 58880, 58880, 58880, 1,
"#dc2300", 56540, 8995, 0, 56320, 8960, 0, 1,
"#ff3333", 65535, 13107, 13107, 65280, 13056, 13056, 1,
"#b84747", 47288, 18247, 18247, 47104, 18176, 18176, 1,
"#99284c", 39321, 10280, 19532, 39168, 10240, 19456, 1,
"#94476b", 38036, 18247, 27499, 37888, 18176, 27392, 1,
"#9966cc", 39321, 26214, 52428, 39168, 26112, 52224, 1,
"#6b2394", 27499, 8995, 38036, 27392, 8960, 37888, 1,
"#5e11a6", 24158, 4369, 42662, 24064, 4352, 42496, 1,
"#4700b8", 18247, 0, 47288, 18176, 0, 47104, 1,
"#2323dc", 8995, 8995, 56540, 8960, 8960, 56320, 1,
"#0099ff", 0, 39321, 65535, 0, 39168, 65280, 1,
"#99ccff", 39321, 52428, 65535, 39168, 52224, 65280, 1,
"#00dcff", 0, 56540, 65535, 0, 56320, 65280, 1,
"#23b8dc", 8995, 47288, 56540, 8960, 47104, 56320, 1,
"#33a3a3", 13107, 41891, 41891, 13056, 41728, 41728, 1,
"#355e00", 13621, 24158, 0, 13568, 24064, 0, 1,
"#7da647", 32125, 42662, 18247, 32000, 42496, 18176, 1,
"#00ae00", 0, 44718, 0, 0, 44544, 0, 1,
"#3deb3d", 15677, 60395, 15677, 15616, 60160, 15616, 1,
"#ffff99", 65535, 65535, 39321, 65280, 65280, 39168, 1,
"#e6e64c", 59110, 59110, 19532, 58880, 58880, 19456, 1,
"#b3b300", 46003, 46003, 0, 45824, 45824, 0, 1,
"#666600", 26214, 26214, 0, 26112, 26112, 0, 1,
"#4c1900", 19532, 6425, 0, 19456, 6400, 0, 1,
"#663300", 26214, 13107, 0, 26112, 13056, 0, 1,
"#804c19", 32896, 19532, 6425, 32768, 19456, 6400, 1,
"#996633", 39321, 26214, 13107, 39168, 26112, 13056, 1,
"#cc6633", 52428, 26214, 13107, 52224, 26112, 13056, 1,
"#ff6633", 65535, 26214, 13107, 65280, 26112, 13056, 1,
"#ff9966", 65535, 39321, 26214, 65280, 39168, 26112, 1,
"#ffcc99", 65535, 52428, 39321, 65280, 52224, 39168, 1
]).
script_frac("0.6").
fg_bg_colors('Black','white').
dont_reencode("FFDingbests:ZapfDingbats").
objshadow_info('#c0c0c0',2,2).
rotate_pivot(0,0,0,0).
spline_tightness(1).
page(1,"",1,'').
group([
polygon('#0099ff','',13,[
150,196,150,234,150,250,166,250,284,250,300,250,300,234,300,196,
300,180,284,180,166,180,150,180,150,196],1,1,1,0,0,0,0,0,0,0,'1',0,
"2490",[
]),
box('#0099ff','',154,184,296,246,1,1,0,1,0,0,0,0,0,'1',0,[
attr("", "auto_center_attr", 0, 1, 0,
text('#0099ff',225,183,1,1,1,144,15,2,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,195,'',[
minilines(144,15,0,0,1,0,0,[
mini_line(144,12,3,0,0,0,[
str_block(0,144,12,3,0,-1,0,0,0,[
str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
"auto_center_attr")])
])
])])),
attr("label=", "f9003eb", 1, 0, 0,
text('#0099ff',225,200,1,1,1,90,29,3,24,5,0,0,0,0,-65534,90,29,0,0,"",0,0,0,0,224,'',[
minilines(90,29,0,0,1,0,0,[
mini_line(90,24,5,0,0,0,[
str_block(0,90,24,5,0,-1,0,0,0,[
str_seg('White','Helvetica-Bold',1,138240,90,24,5,0,-1,0,0,0,0,0,
"f9003eb")])
])
])]))
])
],
4,0,0,[
]).
group([
polygon('#0099ff','',13,[
400,196,400,234,400,250,416,250,534,250,550,250,550,234,550,196,
550,180,534,180,416,180,400,180,400,196],1,1,1,0,33,0,0,0,0,0,'1',0,
"2490",[
]),
box('#0099ff','',404,184,546,246,1,1,0,34,0,0,0,0,0,'1',0,[
attr("", "auto_center_attr", 0, 1, 0,
text('#0099ff',475,183,1,1,1,144,15,35,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,195,'',[
minilines(144,15,0,0,1,0,0,[
mini_line(144,12,3,0,0,0,[
str_block(0,144,12,3,0,-1,0,0,0,[
str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
"auto_center_attr")])
])
])])),
attr("label=", "42b8626", 1, 0, 0,
text('#0099ff',474,200,1,1,1,93,29,36,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,224,'',[
minilines(93,29,0,0,1,0,0,[
mini_line(93,24,5,0,0,0,[
str_block(0,93,24,5,0,-1,0,0,0,[
str_seg('White','Helvetica-Bold',1,138240,93,24,5,0,-1,0,0,0,0,0,
"42b8626")])
])
])]))
])
],
32,0,0,[
]).
group([
polygon('#0099ff','',13,[
650,196,650,234,650,250,666,250,784,250,800,250,800,234,800,196,
800,180,784,180,666,180,650,180,650,196],1,1,1,0,43,0,0,0,0,0,'1',0,
"2490",[
]),
box('#0099ff','',654,184,796,246,1,1,0,44,0,0,0,0,0,'1',0,[
attr("", "auto_center_attr", 0, 1, 0,
text('#0099ff',725,183,1,1,1,144,15,45,12,3,0,0,0,0,-65534,144,15,0,0,"",0,0,0,0,195,'',[
minilines(144,15,0,0,1,0,0,[
mini_line(144,12,3,0,0,0,[
str_block(0,144,12,3,0,-1,0,0,0,[
str_seg('#0099ff','Courier',0,80640,144,12,3,0,-1,0,0,0,0,0,
"auto_center_attr")])
])
])])),
attr("label=", "09e6e96", 1, 0, 0,
text('#0099ff',724,200,1,1,1,93,29,46,24,5,0,0,0,0,-65534,93,29,0,0,"",0,0,0,0,224,'',[
minilines(93,29,0,0,1,0,0,[
mini_line(93,24,5,0,0,0,[
str_block(0,93,24,5,0,-1,0,0,0,[
str_seg('White','Helvetica-Bold',1,138240,93,24,5,0,-1,0,0,0,0,0,
"09e6e96")])
])
])]))
])
],
42,0,0,[
]).
poly('Black','',2,[
400,220,300,220],1,3,1,55,0,1,0,0,0,0,0,'3',0,0,
"0","",[
0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
poly('Black','',2,[
650,220,550,220],1,3,1,56,0,1,0,0,0,0,0,'3',0,0,
"0","",[
0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
poly('Black','',2,[
150,220,50,220],1,3,1,59,0,1,2,0,0,0,0,'3',0,0,
"0","",[
0,12,5,0,'12','5','0'],[0,12,5,0,'12','5','0'],[
]).
oval('#ff3333','',590,90,850,340,0,3,1,72,2,0,0,0,0,'3',0,[
]).
text('Black',590,346,1,0,1,265,29,73,24,5,0,0,0,0,-65534,265,29,0,0,"",0,0,0,0,370,'',[
minilines(265,29,0,0,0,0,0,[
mini_line(265,24,5,0,0,0,[
str_block(0,265,24,5,0,-1,0,0,0,[
str_seg('Black','Helvetica-Bold',1,138240,265,24,5,0,-1,0,0,0,0,0,
"Dernier commit r\351alis\351")])
])
])]).
......@@ -1455,7 +1455,19 @@
\frame{\frametitle{Introduction}
\begin{itemize}
\item
Un moyen simple de savoir sur quelle branche on se trouve :\\
Chaque commit créé possède au moins un père : le commit dont il
est issu
\item
Il existe ainsi une filiation entre les différents commits d'un
dépôt, représentée sous forme d'arbre
\end{itemize}
\begin{center}
\includegraphics[width=8cm]{arbre.eps}
\end{center}
}
%======================================================================
\mygit{git branch}{gitbranch1.txt}
\end{itemize}
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment