summaryrefslogtreecommitdiff
path: root/Documentation/howto/revert-branch-rebase.txt
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-08 02:23:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-11-08 02:23:45 (GMT)
commit77131db5855ed044e30706aa1219d79126686f00 (patch)
treeb4623dfb4ed7399b8a40bbf27723ab47ea3588a6 /Documentation/howto/revert-branch-rebase.txt
parent7141b3b78099941f25b17388f56a917d4f7af51d (diff)
parent390cb0c17a3a0751cfb7490a496930872f752d27 (diff)
downloadgit-77131db5855ed044e30706aa1219d79126686f00.zip
git-77131db5855ed044e30706aa1219d79126686f00.tar.gz
git-77131db5855ed044e30706aa1219d79126686f00.tar.bz2
Merge branch 'master'
Diffstat (limited to 'Documentation/howto/revert-branch-rebase.txt')
-rw-r--r--Documentation/howto/revert-branch-rebase.txt3
1 files changed, 2 insertions, 1 deletions
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