From bf04ed0693f2174f3fbbaea829b218ff5ccd0661 Mon Sep 17 00:00:00 2001
From: Philippe Dosch <Philippe.Dosch@loria.fr>
Date: Wed, 6 Nov 2013 23:13:19 +0100
Subject: [PATCH] Expanse branchnames in example

---
 git.tex | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/git.tex b/git.tex
index 9651be2..c906aa7 100644
--- a/git.tex
+++ b/git.tex
@@ -1512,15 +1512,18 @@
   \framesubtitle{Détail des stratégies étudiées}
   \begin{enumerate}
   \item
-    1) M: rebase N, delete branch N
+    \ex{checkout master, rebase nouvfonc, delete branch nouvfonc}
   \item 
-    2) M: merge N, delete branch N
+    \ex{checkout master, merge nouvfonc, delete branch nouvfonc}
   \item 
-    3) N: rebase M, M: merge N, delete branch N
+    \ex{checkout nouvfonc, rebase master, checkout master, merge
+      nouvfonc, delete branch nouvfonc}
   \item 
-    4) N: rebase M, M: merge --no-ff N, delete branch N
+    \ex{checkout nouvfonc, rebase master, checkout master, merge
+      -{}-no-ff nouvfonc, delete branch nouvfonc}
   \item 
-    5) M: merge N --no-ff, delete branch N
+    \ex{checkout master, merge nouvfonc -{}-no-ff, delete branch
+      nouvfonc}
   \end{enumerate}
 }
 
-- 
GitLab