summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2006-04-18 13:52:46 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2006-04-18 13:52:46 -0700
commitd3d9681a0fc23a47d48b5df296cd267b0b6055b2 (patch)
tree7e7413eba9c394cd20d5850804aa3f31dffce35d /Makefile
parentMerge branch 'lt/logopt' into next (diff)
parentGIT 1.3.0 (diff)
downloadtgif-d3d9681a0fc23a47d48b5df296cd267b0b6055b2.tar.xz
Merge branch 'master' into next
* master: GIT 1.3.0 Add git-annotate(1) and git-blame(1) diff --stat: make sure to set recursive. git-svnimport symlink support
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 84a4b84226..f0be83b296 100644
--- a/Makefile
+++ b/Makefile
@@ -675,7 +675,6 @@ check-docs::
@for v in $(ALL_PROGRAMS) $(BUILT_INS) git$X gitk; \
do \
case "$$v" in \
- git-annotate | git-blame | \
git-merge-octopus | git-merge-ours | git-merge-recursive | \
git-merge-resolve | git-merge-stupid | \
git-ssh-pull | git-ssh-push ) continue ;; \