X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fhowto%2Frebase-and-edit.txt;h=646c55cc6954fbf36a11fbe22cb2c1acb64dfd43;hb=67e31d6234c0332334d7aedd70b2f101bc010cf9;hp=8299ca5cdcc42fb3fc9a255c9fedd26de51a08db;hpb=b30245c8e92ecaf8fb877189d7620a5a9a205120;p=git.git diff --git a/Documentation/howto/rebase-and-edit.txt b/Documentation/howto/rebase-and-edit.txt index 8299ca5cd..646c55cc6 100644 --- a/Documentation/howto/rebase-and-edit.txt +++ b/Documentation/howto/rebase-and-edit.txt @@ -3,6 +3,9 @@ From: Linus Torvalds To: Steve French cc: git@vger.kernel.org Subject: Re: sending changesets from the middle of a git tree +Abstract: In this article, Linus demonstrates how a broken commit + in a sequence of commits can be removed by rewinding the head and + reapplying selected changes. On Sat, 13 Aug 2005, Linus Torvalds wrote: @@ -60,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