From fe41110ff3428a79be8b94f20e8c007290aa2323 Mon Sep 17 00:00:00 2001 From: Arnaud Legrand Date: Wed, 18 Dec 2019 09:29:14 +0100 Subject: [PATCH] git hist is a custom alias... --- module1/slides/diapos_git.org | 2 +- module1/slides/diapos_git.pdf | Bin 1482241 -> 1482283 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/module1/slides/diapos_git.org b/module1/slides/diapos_git.org index 34828e2..4992628 100644 --- a/module1/slides/diapos_git.org +++ b/module1/slides/diapos_git.org @@ -864,7 +864,7 @@ qu'un conflit apparaisse. Pas de panique! \end{overlayarea}\vspace{-1\baselineskip} #+END_EXPORT #+LaTeX: \begin{minipage}[t]{.6\linewidth} -- Ça versionne ! (git *hist*)\medskip +- Ça versionne ! (git *log* / *hist*)\medskip - Ça facilite le travail collaboratif\newline (git *merge*) !\medskip - Ça permet de stocker ses modifications localement\newline (git *commit*) !\medskip #+LaTeX: \end{minipage} diff --git a/module1/slides/diapos_git.pdf b/module1/slides/diapos_git.pdf index b21a088f9e185ac24e037cc0afd9eec58a73cbc9..f4fe0b6dc1217ca1d52226c9d465280da3b68b4e 100644 GIT binary patch delta 5590 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 X+hSFsf232h5{XF@b8@Qcs1g4U{Yt3v delta 5584 zcmai!Rb15F+J@BqYdzJ0h4uC>~%A_<#_+A;|5-xo)JH75Y0YidZS z(cdzNn1KdkA;WMQhycp3P+_r(HI79z{3AK{IzW4~U>%6&LK`4!K$c{K24;-=Sl z`Otnb!T~84ZW7P>Hg;HrQ+%-5fGUHVf>j}Z4h_(%X@S&OeVNHo-|86D22-a@^~uzO zBc=vly4Iy2-bjS}s>cN@gjil1i$MGae_(#5cbig$Qb7Y1Qz31hmf4ts?E!%}!7dI8 zQHy_YA@X5%F;>u-7)AoCu|@&Xg#^BMcdQ`Zesfu#AO>6w`JA#o!PAKg1|xBN-V4Pb z;Kh0oV6JM6xL;5Bq#2FdlTea>;&opG#b?{rNJzjQNj z?F7^?zTW&gdmOJAQ^xcLGhshlR3Dk*6dTdF^wn|)RQn;9Q`F_vh(x%6K0S(juSqZ= z$<10+{LZekYnsbb35~ZpA2AV2E)ygb0FrTWg$qNuKB-AoUfzlllIy;vY8WyQQuZil zH?)>KtDO)LCao?X6wjc+h5G5G(mHWhpLq^+m}Dms4B#cOYwa>mHuA@Quw?>2_svKP zc)`;1I#OE?Kk^=D@iZTrUw&7MWX0Z4KR3YeYr=?aK#N4`=u*7p+cDnK5I_BdedwBI>n zcN%NN1!EoGE%O$DTlg<#vOI)WuvQ&YEPhYe^gHz*noUb1l^A`0TfF0V_cG>)M)k+e z{%V{t*uO?yExG|EpA@*0DOdSAOR_5)v5F~~eEFQ3l%m0CW3(W}l=*vREFgTb)nY?E zE{fR~#y;Un&))L1PD(hqTBjc{e-?)MF}b^41Uqo>>~Z>uCzuFb8D=q%Bj;bXRIf}2 zc^EU##N18e{QS@u%C>##a;fq(;~sA{wVWf#;A}T7wcpPB)vrTb*J?AH9Yr;FlTkx= zEXR7P&2*+sm$H6B8h1QgN&e}*#OcR#r4u33m@+kX+cCiY-|3H^4`lVwhSg*YF;3Y; zw-C2FWs?Yj3GU0HJsLV6f+am6kN$!3H;e*vC_BXaDNSeG zl=pfX_Qbe$Rso?fu|M9Q3SH0md-aU)mYnqXjNOG$x7MBg*E(}ke#i9+@W0Ykfd+B{ zIg#rBk&d5+lVnBQ=m%f@L3h97R#CAJL&taQUPUrM&i@c6gx3Eo@qU)qLnYI>h=u}k;wC~mkPj4#NzzW&U;$CYiR=;p=ksJnnF&+dU+G?-$OC_?WODxIXku)CRF4?uijLDyZ;+rJdjyi%bk4~1X&vaFb{v@KIR=H)0V6*A8vV}A^-js57q{N(i0b7U!Q)r2JdUP# zqZSWGG)_ALt}s_yef~l6Rzh!^EtZpT$$qOBzkee^MEKiIcG`JPOr*>^#LjfSlCkOl z)6ekGI<%@{Zx6+N4vQoQYFH$x$ajr83r~!R$?Lf+-!{B^v6Izwsnwij8ZAtHnO;_X zNk~KG*OS!@lOo!!98%;&F#KZgoi!ByGD)^9oR-UNR4o2;QVGnE7dBZ8TGa|bscKzv zOnO0sQ&bJwv64#Z`w62&r7`o0CbGbw*x>O|sF)@IK^Lyn+l*=Bn@RA=k{>@(10z4> zF3E`#z5W~u_Bv|7HyItuBjhkkC#kUUObZp{Js?L?TcC7M-u}U%CA3^*HCg>*{^>O4 z=|jcd;zeBF=!Ln9y?0*|Xl`*(e|pZPx*G;t!;_R2Bz@t>mZ8o^CKv;y2nPyDIVB1_ zYahm{=nH2%LI~ zTl*hvziDOc5G`fGnWdQc!taJ2tNKH1XB*$ogQ>8p8amepg_@WH=|;?2|J@(1*wGcu z)t8ZhqXyhdmb!`V4llU89s`xD2FjJNpC(4IAwD0D|(iiT26~~1G2CyNeLX)9Aj_Hdv{S-_2=&X_C`XfC1cm-IV_&w_KoKlRH zG`ZJ%M|$XZWAo_lNusdKMSIE5gVTlig&lea)7oNN^;%lw*-^lrGqCD2FyFJ2(C9x) zDt_h5kS)>?H|mNQ@9kDcRPTOm9(EpYez!ZScSmMTesy=yN5=LOUURf_pB{_vcV3zt zH^ka*N3&qV((SP2G}pOFm92F|;8J2gyEs#?O<(!SBaQ5t$A{(lD5tpj(4F48u$fc4 zgR0^>7l=~%i}R6H0GlW03=1x}dgGjImP74PHu7{mT67~eM`12Jf*Mg8qC0M}?HPuN z!fW-q`cNjNz-+2hm00#v-~_(1JF%vfCj_vI$Qf;{t7E>Kv7S6{kjITjO%pG!ad}ma z@T}Oh3hsn8w?>htMGPf-2iYWlFCubGOHgp}4YCf-v0icmeyDU2yrvc*f)Q4CLHSLb{4RhWhZuNw&c0}p>M24+6*_tM@n2H)DvrFuG=I(6QwDQ zrASAchaSm5IiAZ>5(;SO+ZMhI@4FMtded^O#Puv2Vb&jITWydhH~RUo^#}K!G?opUFV+$x=sNE2NihOhuMtVPQ=++n>-1jgXl}mdt}koi zZF%PyYwOJ){vStIYAm%p=ch_5-0RsNzSfL9T)&Jns7}~& zkgVIa6I5s|?c2*cptGPoC>SwRRh$!rfe%AAJ-hRCl>-BI)aP;n`o@%xRo>L$Cd>PjJT!a5;hM19J+>h1^bJI_+zhE*MzM) z%q-cDe&g8AvD>v+X}X3##8@ zA(Q4gJ6{IKrsxH&VRc|}5Ea205g$HjWS)jDl%9nsmn?~Z4MalDeEEn0eaSL(+A^N% zNE@7#9*En}3K0)ZdI`$UhDH7Eod0eKHVJhYbFpyP%ESA8bKOJcKZyXEGqq zHKpb5$w;Y6%cyBctI0}AO2}%;O5c~07FUxH*N~D_z5jqi@qd3oq}3C$6W*7VLKkL2 zAV9FQu^;Q;A?`dEySR9E*0y2P-ZDXIeyQ@JFntojUuwXn9oCZGV!&^QRo)F(EvF&x ztC){wR;MPUeqj6S@!T0!JeyW$E_3I3kv+GE>-Nf$@|%ZTuW8Us+<(5|{u~cqcu9}!H8Ya<(Y9qo{qJ=?-kw`J8;OtW$k;dQ``}G--SJ&D0 z^v-K4uE-LRFI~dJidq-JGWJ#)*|fw4WS#A}x-p_}Gxy3a_W()1+uZbg*5W4N77JmZX0sHPc>%Y-oR zpD5pF1z?lzmu3QGHf9}r6Zr27nB_k`!AL!s$1hD&> zn=yLgL^+?D@+bB=oWrWcsTTXa(*Z|6h0UnBA)ah7b`@)T$!NkBg|L|kf{oD4Q3oQ$ zU@Uiz`{cMMLl&_&@sDiom-eNJ^R8cZX0F!J@~QwMBJ}A%!SX*@sDiVaOsqQ|jrPQm zF_x<2LERA-K(r2h6G@&Pp$kR2?YHQW0Ie=2f?dXHZBHW~W%e-%L? zFXMejtR+AugI}b_YY()F-lLG~S!2e8hrT*t&~|h3qy#5)oqW-5W<4HmmJT+{-vfi_ zqx$8KcHe~EZ#N--0Gx&T!mGH)U3oyTSr{mi8cK9V1BdWriH$GtMwoO*=6S?3*sJ7{=<-V1?uuLAg zuoo^dClWSoA?LY$)>}a&3z^9Y_aN{3TajrynF?m=0rFxggWK-gTzvdz=k z3BWo=3h?h*6HCKi9iK0_L_-|cJlX7=z)kSqGr37sk-nRu&2{FzK>m~~UsagsW`t|p z5%*qA1lwkmUY%vp0J^CIUq(&YIST)_xG{@Kx|+)AXsym8CGM}YXD{JFRmt-g)6(M*yV4vTzBZx7GnvCgELe+dV!f2-#` zBY=+1XmK4|EzeT;pfDGvA~~TP^APw_z^v9;X?X&)cs$_UzW~SS-%YqqXsG}i5*Gx256Rkg_ zB)b*!F-SFLsB#arq!YmROcJmSx{ZRWDi1TAn5eaL(cJz)5QJ^JH4@74NMYdg%; zCn;g^R3%gdzlCUy-c5m{5=L_KYpdKR>&`PH=b@5i(aOR0W>sgA!j?X03~4e?lCOr* zqnGj`^UZ;wuNDpAh^(mrssx>Fp;L2|zK;B!DqQKfF7=x9W^4VU;WltFNX$*l@OD;C z(sc;4CR3Lt&O=O_cz2)nMu`UAGuYT%MS7F`G9?_Qylr}MhD*G|i#riMwW_P*-10vn z9AEy(Bp}#{!@7@not14oRW|ipPuS27OP%ce`zkZ<=;Xp!n=i@V^1*liW7hFJYi_&2 zM}hgVihl!eTDgDWN)Eujhyvx3zpwtvrC+m0`eUpVcw#ml#1+>u_JW&|p5Cp!!cGRt zN$Sb@Xys-Dj{3JrC(4gJ<7$P4aYSDx2;L)ssQ%fI(q$Pl^4ktY)Ir*L zLiULP>$m5!kFO(Wl!{0L3LmX7-qhax_`7psnqgrXkGarlWwf#D5bHVa_UNS_-U$L} zurk}V!(7W4_~%!bZ)-2eIbx6gBVx0|?aF(gm9ZwJYmolW1%e)T`0+*1M#%aWuuzmO+=jpN_nMy9s=)CPY0LW@Wb} qfWMta&*ec_sL6qd(s8SMe@TNNcvNWod