Merge fixes up to GIT 1.1.2

diff --git a/Documentation/git-show-branch.txt b/Documentation/git-show-branch.txt
index ffe64d83533cb60d8a54bd33b784fda52091f9f2..5b76f3b99e2f3a9d0ecc9357117baa1491d4879e 100644 (file)
--- a/Documentation/git-show-branch.txt
+++ b/Documentation/git-show-branch.txt
@@ -85,7 +85,7 @@ Following these N lines, one-line log for each commit is
 displayed, indented N places.  If a commit is on the I-th
 branch, the I-th indentation character shows a '+' sign;
 otherwise it shows a space.  Each commit shows a short name that
-can be used as an exended SHA1 to name that commit.
+can be used as an extended SHA1 to name that commit.
 
 The following example shows three branches, "master", "fixes"
 and "mhf":