Merge branch 'maint'

diff --git a/Documentation/git.txt b/Documentation/git.txt
index 4facf2309512380fc796e5f64e400c6ebcb08dbd..52bc05ad50e8c64734c0f5a33c5bbc551128e955 100644 (file)
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -252,9 +252,6 @@ gitlink:git-annotate[1]::
        Annotate file lines with commit info.
 
 gitlink:git-blame[1]::
-       Blame file lines on commits.
-
-gitlink:git-pickaxe[1]::
        Find out where each line in a file came from.
 
 gitlink:git-check-ref-format[1]::