diff --git a/git-tutorial.tex b/git-tutorial.tex
index 4c3d6ab9077c288d8e2cee2b158b50f9cca64e61..50915662315301b76507b415f09bf7df6122106e 100644
--- a/git-tutorial.tex
+++ b/git-tutorial.tex
@@ -278,8 +278,16 @@ A brief explanation of the command options. \verb|-a| means that all
 modified files will be staged before commit, without it we would only
 commit newly added files. \verb|-m| says that a revision comment will
 follow efter it, without it a text editor (perhaps vi) would start and
-allow you to edit a more comprehensive comment.
+allow you to edit a more comprehensive comment. If you are not
+comfortable with using the system default editor (which may be quite
+understandable if that editor is \emph{vi}) you can easily set your
+shell to use another editor by entering
+\begin{lstlisting}
+andersn@stodola: export EDITOR=nano
+\end{lstlisting}
 
+If you by mistake become stuck in vi and do not know how to get out,
+the sequence \verb|<Esc> <Esc>:q!<enter>| should liberate you.
 
 After performing the first commit, work goes on. New files are added
 and existing files are edited. Whenever it feels motivated, add new