Merge branch 'pb/repo'

diff --git a/Documentation/howto/rebase-and-edit.txt b/Documentation/howto/rebase-and-edit.txt
index 6cc1c7921f0bab8ec2c2b02e47594f57246b141b..646c55cc6954fbf36a11fbe22cb2c1acb64dfd43 100644 (file)
--- 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