summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31b9755)
raw | patch | inline | side by side (parent: 31b9755)
author | Kai Ruemmler <kai.ruemmler@gmx.net> | |
Mon, 7 Nov 2005 08:23:59 +0000 (09:23 +0100) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Mon, 7 Nov 2005 21:28:31 +0000 (13:28 -0800) |
This updates documentation to use git branch -d foo in favour of
rm .git/refs/heads/foo
Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
rm .git/refs/heads/foo
Signed-off-by: Kai Ruemmler <kai.ruemmler@gmx.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Documentation/howto/rebase-and-edit.txt | patch | blob | history | |
Documentation/howto/revert-branch-rebase.txt | patch | blob | history | |
Documentation/howto/using-topic-branches.txt | patch | blob | history |
index 6cc1c7921f0bab8ec2c2b02e47594f57246b141b..646c55cc6954fbf36a11fbe22cb2c1acb64dfd43 100644 (file)
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 e4cce5bf7f8ad78feeedaa37b138991a93a05912..5a7e0cfe05f10f1dd27d39af9c8c690b50972878 100644 (file)
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 d30fa850480446a6682430db2a327986e6f65e69..c6c635a51ee813a9c09b342e2c06a2644b0ac413 100644 (file)
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