Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit 233fc533 authored by Grégory Mounié's avatar Grégory Mounié
Browse files

Mise à jour de slides Ensimag

restore (dasn trace)
switch

ajout de code minted à la place de lstlisting.
parent 0fc7d74f
......@@ -3,7 +3,7 @@
\usepackage{tikz}
\usetikzlibrary{shapes}
\usetikzlibrary{calc,fadings,shapes.arrows,shadows,backgrounds, positioning}
% il exite mainteannt gitdags pour générer du tikz !
% il exite maintenant gitdags pour générer du tikz !
% \usepackage{gitdags}
\usepackage{moy-bouveret-tikz}
......@@ -35,7 +35,7 @@
\begin{frame}
\frametitle{Goals of the presentation}
Assumptions: basic Git (add,commit,push,pull) (one slide recall).
Assumptions: basic Git (add,commit,push,pull) (2 slides recall).
\begin{itemize}
\item Few historical facts
......@@ -70,10 +70,8 @@ Your branch is up to date with 'origin/master'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working
directory)
modified: advanced1h30.tex
(use "git restore <file>..." to discard changes in working directory)
modified: advanced1h30.tex
no changes added to commit (use "git add" and/or "git commit -a")
\end{semiverbatim}
......@@ -115,21 +113,21 @@ no changes added to commit (use "git add" and/or "git commit -a")
\frametitle{Who Makes Git? (Jan. 3rd 2020)}
\footnotesize
\begin{minted}{console}
you@laptop$ git shortlog -s --no-merges | sort -nr | head -26
7070 Junio C Hamano # Google (full-time on Git)
3237 Jeff King # GitHub (almost full-time on Git)
you@laptop$ git shortlog -s --no-merges | sort -nr | head -29
7229 Junio C Hamano # Google (full-time on Git)
3498 Jeff King # GitHub (almost full-time on Git)
1824 Nguyễn Thái Ngọc Duy
1616 Johannes Schindelin # Microsoft (full-time on Git)
1805 Johannes Schindelin # Microsoft (full-time on Git)
1290 Shawn O. Pearce # Google
1104 Linus Torvalds # No longer very active, 1 ci in 2019
988 René Scharfe
953 Michael Haggerty # GitHub
913 René Scharfe
783 Jonathan Nieder # Google
667 Ævar Arnfjörð Bjarmason
802 Jonathan Nieder # Google
693 Ævar Arnfjörð Bjarmason
638 Stefan Beller
575 Christian Couder # Booking.com (50% on Git)
621 Christian Couder # Booking.com (50% on Git)
...
286 Matthieu Moy # UCB/Ensl, ci when @ Ensimag (26/1740)
287 Matthieu Moy # UCB/Ensl, ci when @ Ensimag (29/1843)
\end{minted}
\end{frame}
% $
......@@ -144,7 +142,8 @@ you@laptop$ git shortlog -s --no-merges | sort -nr | head -26
repositories on
GitHub'' \beamerbutton{\url{https://github.com/about/press}}
\item 2017: 25M people and 75M repositories
\item Aug 2019: 40M people and $>100$M repositories
\item Aug 2019: 40M people and $>100$M repositories
\item June 2018: Microsoft buy Github for 7.5 billion \$
\item How about Mercurial? Bitbucket: only Mercurial repos in 2008,
drop it June 1 2020, for becoming Git only.
\end{itemize}
......@@ -155,7 +154,7 @@ you@laptop$ git shortlog -s --no-merges | sort -nr | head -26
\begin{frame}
\frametitle{Numerous alternatives in two families}
See \href{https://en.wikipedia.org/wiki/Comparison_of_version-control_software}{Comparison of 35 version control software in Wikipedia}
See \href{https://en.wikipedia.org/wiki/Comparison_of_version-control_software}{Comparison of 30+ version control software in Wikipedia}
\begin{description}
\item[Distributed:] Git, Mercurial, Bazaar, Darcs, Fossil, Arch (tla) etc.
......@@ -177,7 +176,7 @@ you@laptop$ git shortlog -s --no-merges | sort -nr | head -26
\begin{minted}{console}
you@laptop$ mkdir MyRepo.git
you@laptop$ cd MyRepo.git
you@laptop$ git init .
you@laptop$ git init . # comments on main branch name
you@laptop$ touch myfile.txt
you@laptop$ git hash-object myfile.txt # keep the SHA1 in mind
you@laptop$ git add myfile.txt
......@@ -669,9 +668,8 @@ you@laptop$ git cat-file -p e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 # n'affiche
\begin{overlayarea}{\textwidth}{0.3\textheight}
\only<3->{
\begin{center}
Common rule: if your code isn't clear enough,\\
rewrite it to make it clearer\\
instead of adding comments.
Common rule: if your code isn't clear enough, rewrite it to
make it clearer instead of adding comments.
\end{center}
}
\end{overlayarea}
......@@ -1309,21 +1307,25 @@ Explain here WHY your change is good.
\frametitle{Code: Branches 1/8 (tag, creation)}
The repository will now be developed using ``git-flow'' model.
Add a local tag, and a develop branch.
\begin{minted}[gobble=4]{console}
$ git status
$ git tag -a v1.0
$ git switch -c develop # or git checkout -b develop
$ git branch # should show *develop and master local branch
\end{lstlisting}
{\small
\begin{minted}{console}
you@laptop$ git status
you@laptop$ git tag -a v1.0 # add message
you@laptop$ git switch -c develop # git checkout -b develop
you@laptop$ git branch
* develop
master
\end{minted}
}
At each step, you must visualize the history with one of the two
following commands:
\begin{minted}[gobble=4]{console}
$ git lg # alias log --all --graph --oneline
$ gitk --all
\end{minted}
{\small
\begin{minted}{console}
you@laptop$ git lg # alias log --all --graph --oneline
you@laptop$ gitk --all
\end{minted}
}
\end{frame}
\begin{frame}[fragile]
......@@ -1691,7 +1693,7 @@ Doc/**/*.html
\frametitle{(Very) Large Files: How to ?}
\begin{itemize}
\item Git traces the file content (hash)
\item For common large files (zip, crypto, jpeg/mpeg, mp3), often «tiny»
\item For common large files (zip, crypto, jpeg/mpeg, mp3), often tiny
modifications modify all the content, thus the git delta storage is
inefficient !
\item $\Rightarrow$ \texttt{git lfs} and \texttt{git annex} store
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment