summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/howto/rebase-and-edit.txt2
-rw-r--r--Documentation/howto/revert-branch-rebase.txt3
-rw-r--r--Documentation/howto/using-topic-branches.txt2
3 files changed, 4 insertions, 3 deletions
diff --git a/Documentation/howto/rebase-and-edit.txt b/Documentation/howto/rebase-and-edit.txt
index 6cc1c79..646c55c 100644
--- a/Documentation/howto/rebase-and-edit.txt
+++ b/Documentation/howto/rebase-and-edit.txt
@@ -63,7 +63,7 @@ And then, you can just remove the broken branch if you decide you really
don't want it:
# remove 'broken' branch
- rm .git/refs/heads/broken
+ git branch -d broken
# Prune old objects if you're really really sure
git prune
diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt
index e4cce5b..5a7e0cf 100644
--- a/Documentation/howto/revert-branch-rebase.txt
+++ b/Documentation/howto/revert-branch-rebase.txt
@@ -153,7 +153,8 @@ Everything is in the good order. I do not need the temporary branch
nor tag anymore, so remove them:
------------------------------------------------
-$ rm -f .git/refs/tags/pu-anchor .git/refs/heads/revert-c99
+$ rm -f .git/refs/tags/pu-anchor
+$ git branch -d revert-c99
------------------------------------------------
It was an emergency fix, so we might as well merge it into the
diff --git a/Documentation/howto/using-topic-branches.txt b/Documentation/howto/using-topic-branches.txt
index d30fa85..c6c635a 100644
--- a/Documentation/howto/using-topic-branches.txt
+++ b/Documentation/howto/using-topic-branches.txt
@@ -166,7 +166,7 @@ output from:
is empty. At this point the branch can be deleted:
- $ rm .git/refs/heads/branchname
+ $ git branch -d branchname
Some changes are so trivial that it is not necessary to create a separate
branch and then merge into each of the test and release branches. For