From 8b1ae69f76a7670f7851f66b5a1887c80a6949e2 Mon Sep 17 00:00:00 2001 From: Julien Le Coupanec Date: Sun, 27 Sep 2020 17:56:05 +0200 Subject: [PATCH] docs(git): rework the way we delete a branch --- tools/git.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/git.sh b/tools/git.sh index 2e630ad..c2f3da5 100644 --- a/tools/git.sh +++ b/tools/git.sh @@ -7,12 +7,12 @@ git reset file.txt # Removes file.txt from the stage git rm file.txt # removes file.txt both from git and file system git status # shows the modifications and stuff that are not staged yet -git branch # shows all the branches (current branch is shown with a star) -git branch my-branch # creates my-branch -git branch -d my-branch # deletes my-branch -git checkout my-bracnch # switches to my-branch -git merge my-branch # merges my-branch to current branch -git push origin :my-branch # delete remote branch +git branch # shows all the branches (current branch is shown with a star) +git branch my-branch # creates my-branch +git branch -d my-branch # deletes my-branch +git checkout my-bracnch # switches to my-branch +git merge my-branch # merges my-branch to current branch +git push origin --delete my-branch # delete remote branch git cherry-pick # merge the specified commit