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

ajout des ancêtres

parent b8a36a7c
......@@ -58,7 +58,7 @@
\end{center}
\end{frame}
\begin{frame}[fragile] \frametitle{\texttt{git status}, the single most important command}
\begin{frame}[fragile] \frametitle{\texttt{git status}, one command to rule them all}
\lstinline{git status} displays the current state of the working
directory and the most relevant commands at the current state.
\footnotesize
......@@ -148,6 +148,22 @@ you@laptop$ git shortlog -s --no-merges | sort -nr | head -26
\end{itemize}
\end{frame}
\subsection{Other version control systems}
\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}
\begin{description}
\item[Distributed:] Git, Mercurial, Bazaar, Darcs, Fossil, Arch (tla) etc.
\item[Client-server:] Propertary: ClearCase, Perforce; : SVN,
CVS, RCS, SCCS; etc.
\end{description}
\end{frame}
\section{Git init}
\begin{frame}[fragile]
\frametitle{Code: INIT 1/2}
......@@ -180,7 +196,7 @@ you@laptop$ git shortlog -s --no-merges | sort -nr | head -26
touch Subdir/mysubfile.txt
git add Subdir/mysubfile.txt
git commit -m "second commit"
git config --global alias.lg "log --all --graph --oneline" # Bonus
git config --local alias.lg "log --all --graph --oneline" # Bonus
git lg
\end{minted}
\end{exampleblock}
......@@ -201,7 +217,7 @@ you@laptop$ git shortlog -s --no-merges | sort -nr | head -26
Let's explore the data model of \texttt{.git} !
\end{frame}
% détailler ce slide
\begin{frame}[fragile]
\frametitle{Where is the last commit ? What does it contain ?}
......@@ -1601,6 +1617,8 @@ Doc/**/*.html
\end{exampleblock}
\end{frame}
\section{Bonus: (Git)Config}
\section{Bonus: (Git)LFS and annex}
\begin{frame}
......
Supports Markdown
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