summaryrefslogtreecommitdiff
path: root/Documentation/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-11-05 11:50:24 -0800
committerJunio C Hamano <junkio@cox.net>2005-11-05 11:50:24 -0800
commit87ce294c9129879f717f8749cae1c659e18a3823 (patch)
tree7bda83efef0ee677e4e743954bc00bdcf6a63874 /Documentation/Makefile
parent6ddc0964034342519a87fe013781abf31c6db6ad (diff)
parent3d95bf074e8532fd0643b886422eddd0768a3f2c (diff)
downloadgit-0.99.9d.tar.xz
GIT 0.99.9dv0.99.9d
This is primarily to include the 'git clone -l' (without -s) fix, first spotted and diagnosed by Linus and caused James Bottomley's repository to become unreadable. It also contains documentation updates happened on the "master" branch since 0.99.9c Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/Makefile')
-rw-r--r--Documentation/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3cfa360a9e..741f14cfad 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -52,10 +52,15 @@ install: man
# 'include' dependencies
$(patsubst %.txt,%.1,$(wildcard git-diff-*.txt)): \
diff-format.txt diff-options.txt
-$(patsubst %,%.1,git-fetch git-pull git-push): pull-fetch-param.txt
$(patsubst %.txt,%.html,$(wildcard git-diff-*.txt)): \
diff-format.txt diff-options.txt
+
+$(patsubst %,%.1,git-fetch git-pull git-push): pull-fetch-param.txt
$(patsubst %,%.html,git-fetch git-pull git-push): pull-fetch-param.txt
+
+$(patsubst %,%.1,git-merge git-pull): merge-pull-opts.txt
+$(patsubst %,%.html,git-merge git-pull): merge-pull-opts.txt
+
git.7: ../README
clean: