From e66ab03fcfb508efbe2b73bafc7cf0ef16430378 Mon Sep 17 00:00:00 2001 From: Kai Ruemmler Date: Mon, 7 Nov 2005 09:23:59 +0100 Subject: [PATCH] Documentation update: use git branch -d foo where applicable This updates documentation to use git branch -d foo in favour of rm .git/refs/heads/foo Signed-off-by: Kai Ruemmler Signed-off-by: Junio C Hamano --- Documentation/howto/rebase-and-edit.txt | 2 +- Documentation/howto/revert-branch-rebase.txt | 3 ++- Documentation/howto/using-topic-branches.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/howto/rebase-and-edit.txt b/Documentation/howto/rebase-and-edit.txt index 6cc1c792..646c55cc 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 e4cce5bf..5a7e0cfe 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 d30fa850..c6c635a5 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 -- 2.11.0