From 8278ec3bd843aafd1fd5b586b7c5e84728aeb1bf Mon Sep 17 00:00:00 2001 From: Arnaud Legrand Date: Wed, 27 Nov 2019 12:30:39 +0100 Subject: [PATCH] Cosmetics on the first slides --- module1/slides/diapos_git.org | 25 ++++++++++++------ .../slides/img_git/continuous_history_1.pdf | Bin 0 -> 4591 bytes .../slides/img_git/continuous_history_2.pdf | Bin 0 -> 5172 bytes 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 module1/slides/img_git/continuous_history_1.pdf create mode 100644 module1/slides/img_git/continuous_history_2.pdf diff --git a/module1/slides/diapos_git.org b/module1/slides/diapos_git.org index aa3fb39..4bc2af4 100644 --- a/module1/slides/diapos_git.org +++ b/module1/slides/diapos_git.org @@ -4,6 +4,7 @@ #+EXCLUDE_TAGS: noexport #+LANGUAGE: fr #+SELECT_TAGS: export +#+TAGS: noexport(n) #+LATEX_COMPILER: lualatex #+LATEX_CLASS: beamer #+LATEX_CLASS_OPTIONS: [presentation,bigger] @@ -59,7 +60,7 @@ Les gestionnaires de version datent du début des années 70 de sauvegardes - Sauvegarde les données (avec l’historique) sur des ordinateurs distants -- Fusion "automatique" des fichiers édités par plusieurs personnes. +- Fusion "automatique" des fichiers édités par plusieurs personnes *** \includegraphics[height=.6cm]{img_git/Logo_Git.pdf} #+LaTeX: \begin{columns} #+LaTeX: \begin{column}{.8\linewidth} @@ -82,16 +83,16 @@ file:img_git/linus.jpg ** Objectif de cet exposé #+BEGIN_EXPORT latex \begin{overlayarea}{\linewidth}{0cm} - \begin{flushright} +% \begin{flushright} \null\vspace{-2.0cm}% - \includegraphics[height=0.55\paperheight]{img_git/Git_Xkcd.png} - \end{flushright} + \hbox{\hspace{8cm}\includegraphics[height=0.6\paperheight]{img_git/Git_Xkcd.png}} +% \end{flushright} \end{overlayarea} #+END_EXPORT -- +Apprendre à utiliser =git=+ \vspace{.8cm} \pause +- +Apprendre à utiliser =git=+ \vspace{.6cm} \pause =git= est "explicite" (à la différence \newline de dropbox et - autres)\newline + autres)\medskip\newline Heureusement, il y a des interfaces \vspace{1.2cm} - Notions essentielles pour utiliser les interfaces à =git= - Historique distribué @@ -108,13 +109,21 @@ file:img_git/linus.jpg #+LaTeX: \vfill * L'historique quand on est tout seul ** Son propre projet +#+LaTeX: \begin{columns} +#+LaTeX: \begin{column}{.13\linewidth} +#+LaTeX: \includegraphics<1>[width=\linewidth]{img_git/continuous_history_1.pdf}% +#+LaTeX: \includegraphics<2->[width=\linewidth]{img_git/continuous_history_2.pdf} +#+LaTeX: \end{column} +#+LaTeX: \begin{column}{.8\linewidth} Accès à un certain nombre de fichiers. +#+ATTR_BEAMER: :overlay <+-> - Temps continu - Checkpoint/snapshot: conserver les moments clés du projet pour pouvoir y revenir - \bgroup\tt git \textbf{add}\egroup pour indiquer quelles modifications ont souhaite conserver - \bgroup\tt git \textbf{commit}\egroup pour faire le checkpoint (date, commentaire) - +#+LaTeX: \end{column} +#+LaTeX: \end{columns} ** Une histoire simple #+BEGIN_EXPORT latex \begin{overlayarea}{\linewidth}{8cm} @@ -230,7 +239,7 @@ Accès à un certain nombre de fichiers. \ga<6>{On synchronise des \textbf{branches}\\ en échangeant \\des morceaux d'historiques}{right=of v6} - \ga<6>{Changer l'ellipse d'Alice}{right=of v0} + % \ga<6>{Changer l'ellipse d'Alice}{right=of v0} % % HEAD reference % \gitHEAD % {left=of master} diff --git a/module1/slides/img_git/continuous_history_1.pdf b/module1/slides/img_git/continuous_history_1.pdf new file mode 100644 index 0000000000000000000000000000000000000000..ed7c9ac397fe81bc0372380509f348c2c3460345 GIT binary patch literal 4591 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 KMCw`SBmM^+qA*eb literal 0 HcmV?d00001 diff --git a/module1/slides/img_git/continuous_history_2.pdf b/module1/slides/img_git/continuous_history_2.pdf new file mode 100644 index 0000000000000000000000000000000000000000..005878fcea9e195572690920c38fff8b034e9e77 GIT binary patch literal 5172 zcmcIoc|26@+m}aZ?2%*{C;K+cFk{A&eczWX5taLhQbe*nvP-BG zMUrffC|hW;M)jT<>8W4u`+nYk-gD-2&RpMf-OF{|_c`D1eM{OH7{L&VD2QbBeAxyB z3BUp3(PI!zO+d*4NARKe0w@r&g8%@aWQ6yp;7H)zA4|a*;5><5IEa=OgiImfumKQi zZnD$U1Sp!jVNRA}!6{#IJ?llCpk7N_OxtJ@7nWCpiT}-7+JLpg>hU>Z2dBWq2rSuX zwyf;izDIk$Lz%Q)29CP<`$dLZU9np>{(k()oyd~)iK)N7e<5cTRJ;~k_qg5I`n|cg ze)V3~r6}u5QID=vti4=2Tj`>tn(YDDe^&V>H$?I)O;WtqPCDn3)a6oDtq_r26CU~I z{)NN7xJ1b}{isAs4;G|rbaho-ZPfWDi7scHv-n}Qo}i7FmxmOpmlb-=va@PM^he^>t0{IJ;Pz;DH=RkvU8X`;1% zP7RCY9SFaMd!B}HqX&i!=>}iBMSPI8O#%G-Q zD1(LxuM1|e(dR6EPwY%2FpNMiyWEktYZ1tIq;O{IifHyMNu?}w4gikA%W`Gvl4(-w zk8m{~cU$DJ$7k-kI}wC)f6bG>8^2Q{XG}~pM1P_wGgMNi*?#k>v^u`BPlriUoLyh) z@;`S{4j1s4OgxQ=h!ys3yJ%o?PE#Hwu4mzG6lznDByjd5DIIo(Ig`zNpv8Tfzc&_k z`ja)=@l43|x8a6_I9GogEAicecc*bAmYVq6g6PB|>q61v4*dMdf7N7*514bk)-?M1 zut21O0Cg5jImY;U<-EAVEmzsTVc4hGa3TDOhfM8g>46W9shz3=PxV3=VSI(+>9QwP z^%e#5DY^pt;(#>4v$x=kW*RjM{MeP=-HUgtdg}yd2Txb4P^67)UGPJhFTF6uC*LKJ z5A+{%u4oW^Hf#m&Z)HY3B8O$1SUN2uS<+0|#nBO8KlfDklC-8v#?9V%bC65HJTtNO%vrZ4TO zo)#+F)AK-tJ75iRqMnU=#~8ELpB8FtbY*ar^VUqfbzABQPU2)xry} zY$|sc2OR$ zE0}ig#3`)#6Y4wh!q2%8EApa=9i=KOf$_pi0^z$3r3@C!D2ZsbXoj@`ERzL~kJ~0$ zDc#o^+8N}Q%3~G5ea}-%M3=&@+9qxL#&cFv=`bVtB=nQtbd&bv2qr{H^z2um=&2(O zZ4V|xTG*do6FvBF-`8HBrlKyra2|EII7ts0Fd-q=DUpy}vTmuR3xy^|hD@6XACZ!KvwB|7<6s_s#Zt&P9yHHd6N=@MZ zHU0!%3)0UhcD?0{Vw>*sH2f5xddd2 z*ds-byqoPSb%m1c>saLAZZRXQ{^XL&>6yzN-?&lfb0NhYSIAkP{P7N15nb}1rUIeClDX3-baXp1d$1cMEP)(IYuGbv8#VLy2;Q+POK?$d@tD^K3*^{RnpYju-bi(xKO{^(8ItO&Dhy; zGIY87+qh^mbwh(;^A5wSwYt)Lte!S}VT!Ch}b1ZieQFi52+)^QZ)P z#Q}zYzD0gM^8NJ~f9gZUud%gpIRHtyonm#3ZsA~lKk#1hNgLnNe&r#SSH7$H$T`i} z-A79F3r9~+8hfqz5}=iF1>EHwyX*1|4nN$PD-e2do^-Z0e(!y3G6ZFCYhU}%^$Q9vT?EH}C=?A+XUxpo0$iQojeM#0DJ8Yup z78SzW|0S~&uXUos^q#$Wdu-v{{&fA09K!RYy(0n>4KDII#ZED~Pj5NCPJ;+JnI4Ko z&U{g8Vi{w4IIwp%S!(AHs|+`X;mP|)^_MGlSThBe+CNBOE1ZY)uJNn-Ihd8U_ZKh7 z$d)(;d}La)ts7*Rd!KzqxaUIFt=evqCHj21m=I#f!lHXJw}O|0%?MM>niQ1JT@brp zKVxZEgjm)^*mPZr@X;qQ2S)iJnfjo8Z>bhpYr;h`4K3Fj*{?Wjqo*v2M9`N^>+3El zXjgwdIH>r<@_e4`v5;3LCO)c812-=0&f3R&p?Es}7QA28(-bM99dN@Z+sRcH*W}2z zC-`P!*e82tDn|%Ie1?sde=e6_((ck^r_|VS6%(N@j=>;#EhQ-?TW);r5l6-M=o?pD z*nadYPaFOP7@v5BkTQ%^X5Zra2Jo5 zV(p2}a^0}1zy>2lSXTf24n1x;{sb7o^w`avvPxpsj^42_t_2-m{m8MRwedinN*>KvZRz1;Zi`?VZBJZd99&GEmm2KR zs`);33fU>WCN1?QlkB<7a8MMhb}IMmk%@6?HGTh`2ed(bZGY7Im{n4AXH{K93qr&~T^OIm zaL(}bs#vC~W{aWvTj?S&G1fCLHdDHLZi(V3EoN;Sr&rpMn^{!o13Y6<0^=s{AdB(P zpHxjFi*2e#!Bw}}Q|(V$LC|RN|F*VsOY0%D0qh-%nsKQk`KM~SLUhw_tYox(^Bsgn zM?Xpv)QJ`Tv_if*TPV_^?HTp%-1@zG$|&w1QQ2vziu07^eKiGBadwP)52rEQYRc7- zaNyQM%-N0LZcOkfvy|iqYq@T<(((udwuOb6Ve`N~i|*9&4XxGXTOLOn-o$Ff90_1! zh9yThe6+M=Z8)=fIlr!JF3&4U#KX@3leK9Bn>iAgV&-WVX&@EntLrkPy!6ha^j1Ra ztZ3#1f9NfHR)~cbDo&O==W+bnA-)?r$BU24RTAxMJZgf6=jS9PN$w$z3PkVAof|Hm zXL5>jJ@5~xNq?r6p0FReRYv|yErO;wwkdl{D9~h$0gmiR!Us}_BpUD2m5voQ0F*5U zUCf=GE#yrJUU;05KQR>duY(ab0Pi0L$k3kwTMuQoiu+@IK(V0wvo5_YX#+#3zyTN% zg8>k53>r{F!+(exQwr7}@2N}h@y7vhdMRD9Cru%NE_9RDKblP|Ob7I_fhIV-kMF-O z_7q%zBY@fRrx_;O1}#8PjNp_3nqK);ztF_npUI#%U>|&xLKkiaL4`z16dl#Wl5uny z_&+8FPa;$FeX*qN@GY=EYy<*Duj2P~1M~sen%IT}aGwHC@Bx&Z@C01~8NUtC%Q@k_ zD8A$$0+IGM{C}S)3~jFb?4l z&|pSr2SC`y5NJ5~wfqkZr3Pm5cMJ}v4ax5q0)+-=`tKMLf&QZ`LQUllOa=AdVX9!h zf3HskgZZNk6*c%D^&wSN{_sPhQD7>!>!Xmc;LA#)Z|vFQ!*R4+(LPFcL?SroTT2j{ fZA$P4$Cf@Xww4iC5`~^!BnG4sNl8O%BglUN$u%=W literal 0 HcmV?d00001 -- 2.18.1