[FE training-materials-updates] kernel slides: misc updates to the git part

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git
On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=cfeef46f3d7e62273865b2966d25d93b47cd52f6

>---------------------------------------------------------------

commit cfeef46f3d7e62273865b2966d25d93b47cd52f6
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Thu Mar 10 10:22:42 2016 +0100

    kernel slides: misc updates to the git part
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

cfeef46f3d7e62273865b2966d25d93b47cd52f6
 slides/kernel-git-content/git-gui.png            | Bin 0 -> 98813 bytes
 slides/kernel-git-content/kernel-git-content.tex |  30 ++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/slides/kernel-git-content/git-gui.png b/slides/kernel-git-content/git-gui.png
new file mode 100644
index 0000000..e6c463b
Binary files /dev/null and b/slides/kernel-git-content/git-gui.png differ
diff --git a/slides/kernel-git-content/kernel-git-content.tex b/slides/kernel-git-content/kernel-git-content.tex
index f393998..3a6688b 100644
--- a/slides/kernel-git-content/kernel-git-content.tex
+++ b/slides/kernel-git-content/kernel-git-content.tex
@@ -108,7 +108,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
   \frametitle{Visualize the History: cgit}
   \begin{itemize}
   \item Another great tool is cgit, a web interface to Git. For the
-    kernel, it is available at \url{http://git.kernel.org/}
+    kernel sources, it is used on \url{http://git.kernel.org/}
   \end{itemize}
   \begin{center}
     \includegraphics[height=0.65\textheight]{slides/kernel-git-content/git-kernel-org.png}
@@ -261,13 +261,14 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
     others, the best is to have your own public repository
   \item Use a git hosting service on the Internet:
     \begin{itemize}
-    \item Gitorious (\url{https://gitorious.org/})
+    \item GitLab (\url{http://gitlab.com/})
       \begin{itemize}
-      \item Open Source server. Easiest. For public repositories.
+      \item Open Source server. Proprietary and commercial extensions
+       available.
       \end{itemize}
     \item GitHub (\url{https://github.com/})
       \begin{itemize}
-      \item For public repositories. Have to pay for private
+      \item For public repositories. Need to pay for private
         repositories.
       \end{itemize}
     \end{itemize}
@@ -339,10 +340,27 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
 
 
 \begin{frame}
+  \frametitle{git-gui}
+  \url{http://www.git-scm.com/docs/git-gui}
+  \begin{itemize}
+  \item A graphical interface to create and manipulate commits,
+    replacing multiple git command-line commands.
+  \item Not meant for history browsing (opens \code{gitk}
+    when needed).
+  \begin{center}
+    \includegraphics[height=0.45\textheight]{slides/kernel-git-content/git-gui.png}
+  \end{center}
+  \item Example usage on Ubuntu/Debian:\\
+    \code{sudo apt-get install git-gui}\\
+    \code{git gui blame Makefile}
+  \end{itemize}
+\end{frame}
+
+\begin{frame}
   \frametitle{About Git}
   \begin{itemize}
   \item We have just seen the very basic features of Git.
-  \item A lot more interesting features are available (rebasing,
+  \item Many more interesting features are available (rebasing,
     bisection, merging and more)
   \item References
     \begin{itemize}
@@ -350,7 +368,7 @@ Signed-off-by: David S. Miller <davem at davemloft.net>
       \begin{itemize}
       \item \url{http://schacon.github.com/git/user-manual.html}
       \end{itemize}
-    \item Git Book
+    \item Git Book (freely available on-line, or in print form)
       \begin{itemize}
       \item \url{http://git-scm.com/book}
       \end{itemize}