Create a sysconfdir variable, and use it for ETC_GITCONFIG

diff --git a/Documentation/howto/rebase-and-edit.txt b/Documentation/howto/rebase-and-edit.txt
index 8299ca5cdcc42fb3fc9a255c9fedd26de51a08db..646c55cc6954fbf36a11fbe22cb2c1acb64dfd43 100644 (file)
--- a/Documentation/howto/rebase-and-edit.txt
+++ b/Documentation/howto/rebase-and-edit.txt
@@ -3,6 +3,9 @@ From:   Linus Torvalds <torvalds@osdl.org>
 To:    Steve French <smfrench@austin.rr.com>
 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