diff --git a/.gitignore b/.gitignore index 2dbabbf..2e88241 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ *.tex.kate-swp *.vrb *.backup +*.autosave diff --git a/cours_git.tex b/cours_git.tex index 987ef45..2639412 100644 --- a/cours_git.tex +++ b/cours_git.tex @@ -262,11 +262,39 @@ \item Dans le cas que la branche remote n'existe pas (elle va être crée): \verb|git push -u origin NAME| \end{itemize} \end{itemize} - \end{frame} \subsection{Les techniques de pull} +\begin{frame} +\frametitle{Pull merge (default)} + \begin{columns}[T] + \column{0.5\textwidth} + \begin{center} + \includegraphics[height=0.7\textheight]{img/pull_before} + \end{center} + \column{0.5\textwidth} + \begin{center} + \includegraphics[height=0.7\textheight]{img/pull_merge} + \end{center} + \end{columns} +\end{frame} + +\begin{frame} +\frametitle{Pull rebase} + \begin{columns}[T] + \column{0.5\textwidth} + \begin{center} + \includegraphics[height=0.7\textheight]{img/pull_before} + \end{center} + \column{0.5\textwidth} + \begin{center} + \includegraphics[height=0.7\textheight]{img/pull_rebase} + \end{center} + \end{columns} +\end{frame} + + \begin{frame} \frametitle{} \end{frame} diff --git a/img/pull.dia b/img/pull.dia new file mode 100644 index 0000000..c94d8ae Binary files /dev/null and b/img/pull.dia differ diff --git a/img/pull_before.png b/img/pull_before.png new file mode 100644 index 0000000..04f1536 Binary files /dev/null and b/img/pull_before.png differ diff --git a/img/pull_merge.png b/img/pull_merge.png new file mode 100644 index 0000000..3698b87 Binary files /dev/null and b/img/pull_merge.png differ diff --git a/img/pull_rebase.png b/img/pull_rebase.png new file mode 100644 index 0000000..1c3c00e Binary files /dev/null and b/img/pull_rebase.png differ