Documentation: -merge and -pull: describe merge strategies.

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 3cfa360a9e4876286bfb37230daca6af8c799725..741f14cfad214cfc69aad0f5965917bd2f0ef280 100644 (file)
--- 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: