[FE training-materials-updates] git: agenda improvements
Alexandre Belloni
alexandre.belloni at free-electrons.com
Thu Jul 23 10:35:28 CEST 2015
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=83bd02f3b13184dc41e85e362e71c3c4282ae7f8
>---------------------------------------------------------------
commit 83bd02f3b13184dc41e85e362e71c3c4282ae7f8
Author: Alexandre Belloni <alexandre.belloni at free-electrons.com>
Date: Thu Jul 23 10:35:01 2015 +0200
git: agenda improvements
Signed-off-by: Alexandre Belloni <alexandre.belloni at free-electrons.com>
>---------------------------------------------------------------
83bd02f3b13184dc41e85e362e71c3c4282ae7f8
agenda/git-agenda.tex | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/agenda/git-agenda.tex b/agenda/git-agenda.tex
index 970cd40..d35e0b5 100644
--- a/agenda/git-agenda.tex
+++ b/agenda/git-agenda.tex
@@ -118,6 +118,7 @@ Source control using Git training\\
{Lecture - Organizing sources}
{
\begin{itemize}
+ \item Navigating in sources and history
\item Branches: creation, deletion, merging
\item Rewriting history with {\em rebase}
\item Tags
@@ -145,6 +146,7 @@ Source control using Git training\\
\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
+ \item Getting more efficient
\end{itemize}
}
{Lab - Collaborating}
@@ -159,19 +161,19 @@ Source control using Git training\\
}
\\
\feagendatwocolumn
-{Lecture - Advanced source organization}
+{Lecture - Workflows}
{
\begin{itemize}
- \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}
+ \item Centralized workflow, often used in internal company projects
+ \item Linux Kernel workflow, often used in open-source communities
\end{itemize}
}
-{Lecture - Workflows}
+{Lecture - Advanced source organization}
{
\begin{itemize}
- \item Centralized workflow, often used in internal company projects
- \item Linux Kernel workflow, often used in open-source communities
+ \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}
}
More information about the training-materials-updates
mailing list