diff --git a/git.tex b/git.tex index 9651be2f5ac654e2238fc17a5763073aa8adc008..c906aa759e012f5e2a53ec3d8b004a7e2fbf2d69 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} }