From 519ed147c447a63e8dfa66ee1c07a65a30ab21ba Mon Sep 17 00:00:00 2001 From: Laurent Modolo <laurent.modolo@ens-lyon.fr> Date: Wed, 12 Jul 2017 10:39:17 +0200 Subject: [PATCH] add conclusion --- presentation.tex | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/presentation.tex b/presentation.tex index 64e1b7f..07a3f63 100644 --- a/presentation.tex +++ b/presentation.tex @@ -1321,7 +1321,40 @@ To ../delta 52784d4..fdaa5a9 master -> master \end{shcode} \vspace{-2.5em} +\end{frame} + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Summary} +\begin{frame} + \frametitle{Summary so far} +\begin{shcode} +git init +git add <file> / git rm <file> +git commit -m "<commit message>" +git remote add <name> <url> +git push <remote_name> <remote_branch> +git fetch <remote_name> <remote_branch> +git merge <ref_name> +\end{shcode} +\vspace{-2.5em} \end{frame} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{To go further} +\begin{frame} + \frametitle{To go further...} +Additional commands +\begin{shcode} +git commit --amend +git stash / git stash pop +git rebase -i +git add -p +git cherry-pick +git bisect +git revert +... +\end{shcode} +\vspace{-2.5em} +\end{frame} \end{document} -- GitLab