diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-11-08 05:23:45 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-11-08 05:23:45 +0300 |
| commit | 77131db5855ed044e30706aa1219d79126686f00 (patch) | |
| tree | b4623dfb4ed7399b8a40bbf27723ab47ea3588a6 /Documentation/howto | |
| parent | 7141b3b78099941f25b17388f56a917d4f7af51d (diff) | |
| parent | 390cb0c17a3a0751cfb7490a496930872f752d27 (diff) | |
Merge branch 'master'
Diffstat (limited to 'Documentation/howto')
| -rw-r--r-- | Documentation/howto/rebase-and-edit.txt | 2 | ||||
| -rw-r--r-- | Documentation/howto/revert-branch-rebase.txt | 3 | ||||
| -rw-r--r-- | 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 6cc1c7921f..646c55cc69 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 e4cce5bf7f..5a7e0cfe05 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 d30fa85048..c6c635a51e 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 |