From ba1c0acb35eed2ffbc76130c5653320694f2e5b2 Mon Sep 17 00:00:00 2001
From: Philippe Dosch <Philippe.Dosch@loria.fr>
Date: Wed, 6 Nov 2013 23:51:58 +0100
Subject: [PATCH] Fix git branch deletion syntax
---
git.tex | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/git.tex b/git.tex
index 99ecd63..6fff828 100644
--- a/git.tex
+++ b/git.tex
@@ -1569,7 +1569,7 @@
{
\ex{git checkout master}\\
\ex{git merge nouvfonc}\\
- \ex{git delete branch nouvfonc}
+ \ex{git branch -d nouvfonc}
}
{strat2.png}
{
@@ -1592,7 +1592,7 @@
\ex{git rebase master}\\
\ex{git checkout master}\\
\ex{git merge nouvfonc}\\
- \ex{git delete branch nouvfonc}
+ \ex{git branch -d nouvfonc}
}
{strat3.png}
{
@@ -1614,7 +1614,7 @@
\ex{git rebase master}\\
\ex{git checkout master}\\
\ex{git merge -{}-no-ff nouvfonc}\\
- \ex{git delete branch nouvfonc}
+ \ex{git branch -d nouvfonc}
}
{strat4.png}
{
@@ -1633,7 +1633,7 @@
{
\ex{git checkout master}\\
\ex{git merge nouvfonc -{}-no-ff}\\
- \ex{git delete branch nouvfonc}
+ \ex{git branch -d nouvfonc}
}
{strat5.png}
{
--
GitLab