[FE training-materials-updates] Add some more contents
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Wed Jul 22 16:01:46 CEST 2015
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=9721efc843a40444804af29fd64b63540f6fba25
>---------------------------------------------------------------
commit 9721efc843a40444804af29fd64b63540f6fba25
Author: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Date: Wed Jul 22 16:01:43 2015 +0200
Add some more contents
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
>---------------------------------------------------------------
9721efc843a40444804af29fd64b63540f6fba25
agenda/git-agenda.tex | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/agenda/git-agenda.tex b/agenda/git-agenda.tex
index 448053b..970cd40 100644
--- a/agenda/git-agenda.tex
+++ b/agenda/git-agenda.tex
@@ -96,11 +96,11 @@ Source control using Git training\\
{Lecture - Source control}
{
\begin{itemize}
- \item Version control systems
- \item Distributed ?
- \item Git glossary
- \item Git basics
- \item HEAD, index, working directory
+ \item Version control systems: principles
+ \item Centralized vs. distributed version control systems
+ \item Git glossary and internal representation of data
+ \item Git basics: installation and configuration, getting a repository, making commits, etc.
+ \item Basic Git workflow: understanding {\em HEAD}, {\em index} and {\em working directory}
\end{itemize}
}
{Lab - Basic Git usage}
@@ -118,10 +118,10 @@ Source control using Git training\\
{Lecture - Organizing sources}
{
\begin{itemize}
- \item Branches
- \item Rewriting history
+ \item Branches: creation, deletion, merging
+ \item Rewriting history with {\em rebase}
\item Tags
- \item stash
+ \item Temporary storage of changes with {\em stash}
\end{itemize}
}
{Lab - Everyday Git usage}
@@ -142,9 +142,9 @@ Source control using Git training\\
{Lecture - Collaborating}
{
\begin{itemize}
- \item Remotes
- \item Importing changes
- \item Sending changes
+ \item Git {\em remotes}: interacting with other developers
+ \item Importing changes: fetching changes from other developers, applying patches
+ \item Sending changes: pushing commits and sending patches
\end{itemize}
}
{Lab - Collaborating}
@@ -162,16 +162,16 @@ Source control using Git training\\
{Lecture - Advanced source organization}
{
\begin{itemize}
- \item submodules
- \item repo
- \item filter-branch
+ \item Referencing Git repositories from another repository with {\em git submodules}
+ \item Managing easily a large number of Git repositories with Google's {\em repo} tool
+ \item Rewriting branches in an automated way with {\em filter-branch}
\end{itemize}
}
{Lecture - Workflows}
{
\begin{itemize}
- \item centralized workflow
- \item linux kernel workflow
+ \item Centralized workflow, often used in internal company projects
+ \item Linux Kernel workflow, often used in open-source communities
\end{itemize}
}
More information about the training-materials-updates
mailing list